openstack
/
python-glanceclient
Code Issues Proposed changes

Merge "Make --profile load from environment variables"

This commit is contained in:
Jenkins 2017-07-26 04:33:49 +00:00 committed by Gerrit Code Review
parent f455cb1939 c0f88d5fc0
commit ca9ae01841
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/cli/details.rst
View File

@ -95,11 +95,11 @@ glance optional arguments
HMAC key to use for encrypting context data for
performance profiling of operation. This key should be
the value of HMAC key configured in osprofiler
middleware in glance, it is specified in paste
configuration file at /etc/glance/api-paste.ini and
/etc/glance/registry-paste.ini. Without key the
middleware in glance, it is specified in glance
configuration file at /etc/glance/glance-api.conf and
/etc/glance/glance-registry.conf. Without key the
profiling will not be triggered even if osprofiler is
enabled on server side.
enabled on server side. Defaults to ``env[OS_PROFILE]``.
``--key-file OS_KEY``
**DEPRECATED!** Use --os-key.

12
glanceclient/shell.py
View File

@ -184,16 +184,18 @@ class OpenStackImagesShell(object):
if osprofiler_profiler:
parser.add_argument('--profile',
metavar='HMAC_KEY',
default=utils.env('OS_PROFILE'),
help='HMAC key to use for encrypting context '
'data for performance profiling of operation. '
'This key should be the value of HMAC key '
'configured in osprofiler middleware in '
'glance, it is specified in paste '
'glance, it is specified in glance '
'configuration file at '
'/etc/glance/api-paste.ini and '
'/etc/glance/registry-paste.ini. Without key '
'the profiling will not be triggered even '
'if osprofiler is enabled on server side.')
'/etc/glance/glance-api.conf and '
'/etc/glance/glance-registry.conf. Without '
'key the profiling will not be triggered even '
'if osprofiler is enabled on server side. '
'Defaults to env[OS_PROFILE].')
self._append_global_identity_args(parser, argv)