x/python-moganclient
Code Issues Proposed changes

Merge "Add support for injecting keypair"

Browse Source
This commit is contained in:
Jenkins 2017-04-22 06:24:58 +00:00 committed by Gerrit Code Review
commit 09dd550035
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moganclient/osc/v1/server.py
View File

@ -121,6 +121,11 @@ class CreateServer(command.ShowOne):
metavar='<user-data>', metavar='<user-data>',
help=_('User data file to inject into the instance'), 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( parser.add_argument(
'--property', '--property',
metavar='<key=value>', metavar='<key=value>',
@ -204,6 +209,7 @@ class CreateServer(command.ShowOne):
availability_zone=parsed_args.availability_zone, availability_zone=parsed_args.availability_zone,
userdata=userdata, userdata=userdata,
files=files, files=files,
key_name=parsed_args.key_name,
extra=parsed_args.property, extra=parsed_args.property,
min_count=parsed_args.min, min_count=parsed_args.min,
max_count=parsed_args.max max_count=parsed_args.max

5
moganclient/v1/server.py
View File

@ -30,7 +30,8 @@ class ServerManager(base.ManagerWithFind):
def create(self, name, image_uuid, flavor_uuid, networks, def create(self, name, image_uuid, flavor_uuid, networks,
description=None, availability_zone=None, extra=None, 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' url = '/instances'
data = { data = {
'name': name, 'name': name,
@ -85,6 +86,8 @@ class ServerManager(base.ManagerWithFind):
data['availability_zone'] = availability_zone data['availability_zone'] = availability_zone
if description is not None: if description is not None:
data['description'] = description data['description'] = description
if key_name is not None:
data['key_name'] = key_name
if extra is not None: if extra is not None:
data['extra'] = extra data['extra'] = extra
if min_count is not None: if min_count is not None: