Merge "Make --os-profile load from environment variables"

This commit is contained in:
Jenkins 2017-07-05 19:23:19 +00:00 committed by Gerrit Code Review
commit 7487c51bb3
3 changed files with 8 additions and 1 deletions

View File

@ -283,6 +283,7 @@ class OpenStackShell(app.App):
'--os-profile', '--os-profile',
metavar='hmac-key', metavar='hmac-key',
dest='profile', dest='profile',
default=utils.env('OS_PROFILE'),
help=_('HMAC key for encrypting profiling context data'), help=_('HMAC key for encrypting profiling context data'),
) )
# NOTE(dtroyer): This global option should have been named # NOTE(dtroyer): This global option should have been named

View File

@ -112,7 +112,7 @@ global_options = {
'--os-default-domain': (DEFAULT_DOMAIN_NAME, True, True), '--os-default-domain': (DEFAULT_DOMAIN_NAME, True, True),
'--os-cacert': ('/dev/null', True, True), '--os-cacert': ('/dev/null', True, True),
'--timing': (True, True, False), '--timing': (True, True, False),
'--os-profile': ('SECRET_KEY', True, False), '--os-profile': ('SECRET_KEY', True, True),
'--os-interface': (DEFAULT_INTERFACE, True, True) '--os-interface': (DEFAULT_INTERFACE, True, True)
} }

View File

@ -0,0 +1,6 @@
---
features:
- |
``--os-profile`` argument can be loaded from ``OS_PROFILE``
environment variables to avoid repeating ``--os-profile``
in openstack commands.