Merge "Add support for injecting keypair"
This commit is contained in:
commit
09dd550035
@ -121,6 +121,11 @@ class CreateServer(command.ShowOne):
|
||||
metavar='<user-data>',
|
||||
help=_('User data file to inject into the instance'),
|
||||
)
|
||||
parser.add_argument(
|
||||
'--key-name',
|
||||
metavar='<key-name>',
|
||||
help=_('Keypair to inject into this server (optional extension)'),
|
||||
)
|
||||
parser.add_argument(
|
||||
'--property',
|
||||
metavar='<key=value>',
|
||||
@ -204,6 +209,7 @@ class CreateServer(command.ShowOne):
|
||||
availability_zone=parsed_args.availability_zone,
|
||||
userdata=userdata,
|
||||
files=files,
|
||||
key_name=parsed_args.key_name,
|
||||
extra=parsed_args.property,
|
||||
min_count=parsed_args.min,
|
||||
max_count=parsed_args.max
|
||||
|
@ -30,7 +30,8 @@ class ServerManager(base.ManagerWithFind):
|
||||
|
||||
def create(self, name, image_uuid, flavor_uuid, networks,
|
||||
description=None, availability_zone=None, extra=None,
|
||||
userdata=None, files=None, min_count=None, max_count=None):
|
||||
userdata=None, files=None, key_name=None, min_count=None,
|
||||
max_count=None):
|
||||
url = '/instances'
|
||||
data = {
|
||||
'name': name,
|
||||
@ -85,6 +86,8 @@ class ServerManager(base.ManagerWithFind):
|
||||
data['availability_zone'] = availability_zone
|
||||
if description is not None:
|
||||
data['description'] = description
|
||||
if key_name is not None:
|
||||
data['key_name'] = key_name
|
||||
if extra is not None:
|
||||
data['extra'] = extra
|
||||
if min_count is not None:
|
||||
|
Loading…
x
Reference in New Issue
Block a user