openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Fix trusted-image-certificate-id help text"

This commit is contained in:
Zuul 2018-06-22 15:24:39 +00:00 committed by Gerrit Code Review
parent db4fd9a5f0 d422fb061f
commit 003ac57d9a
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/cli/nova.rst
View File

@ -1011,7 +1011,7 @@ nova boot
[--config-drive <value>] [--poll] [--admin-pass <value>]
[--access-ip-v4 <value>] [--access-ip-v6 <value>]
[--description <description>]
[--trusted-image-certificate-id]
[--trusted-image-certificate-id <trusted-image-certificate-id>]
<name>
Boot a new server.

14
novaclient/v2/shell.py
View File

@ -515,8 +515,13 @@ def _boot(cs, args):
boot_kwargs['trusted_image_certificates'] = (
args.trusted_image_certificates)
elif utils.env('OS_TRUSTED_IMAGE_CERTIFICATE_IDS'):
boot_kwargs["trusted_image_certificates"] = utils.env(
'OS_TRUSTED_IMAGE_CERTIFICATE_IDS').split(',')
if cs.api_version >= api_versions.APIVersion('2.63'):
boot_kwargs["trusted_image_certificates"] = utils.env(
'OS_TRUSTED_IMAGE_CERTIFICATE_IDS').split(',')
else:
raise exceptions.UnsupportedAttribute(
"OS_TRUSTED_IMAGE_CERTIFICATE_IDS",
"2.63")
return boot_args, boot_kwargs
@ -1924,8 +1929,9 @@ def do_rebuild(cs, args):
# confusion with unsetting the value.
kwargs['trusted_image_certificates'] = trusted_image_certificates
elif utils.env('OS_TRUSTED_IMAGE_CERTIFICATE_IDS'):
raise exceptions.UnsupportedAttribute("trusted_image_certificates",
"2.63")
raise exceptions.UnsupportedAttribute(
"OS_TRUSTED_IMAGE_CERTIFICATE_IDS",
"2.63")
server = server.rebuild(image, _password, **kwargs)
_print_server(cs, args, server)