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

This commit is contained in:
Jenkins 2017-06-25 14:34:25 +00:00 committed by Gerrit Code Review
commit 6770472c95
1 changed files with 5 additions and 4 deletions

View File

@ -101,12 +101,13 @@ class SenlinShell(object):
def add_profiler_args(self, parser):
if osprofiler_profiler:
parser.add_argument(
'--os-profile', metavar='HMAC_KEY',
'--os-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 senlin, it is specified in the paste '
'deploy configuration (/etc/senlin/api-paste.ini). '
'be the value of HMAC key configured in '
'senlin configuration (/etc/senlin/senlin.conf). '
'Without the key, profiling will not be triggered '
'even if osprofiler is enabled on server side.'))