Rename --profile to --os-profile
* The --profile global option is deprecated but will be supported through at least April 2017. * Update man page Closes-bug: #1571812 Change-Id: I2e623411a56096b4cc352f4eedbf770632ae2cc3
This commit is contained in:
parent
1de0831b63
commit
39174a7e91
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
"""Command-line interface to the OpenStack APIs"""
|
"""Command-line interface to the OpenStack APIs"""
|
||||||
|
|
||||||
|
import argparse
|
||||||
import getpass
|
import getpass
|
||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
|
@ -131,6 +132,16 @@ class OpenStackShell(app.App):
|
||||||
self.log.info("END return value: %s", ret_val)
|
self.log.info("END return value: %s", ret_val)
|
||||||
|
|
||||||
def init_profile(self):
|
def init_profile(self):
|
||||||
|
# NOTE(dtroyer): Remove this 'if' block when the --profile global
|
||||||
|
# option is removed
|
||||||
|
if osprofiler_profiler and self.options.old_profile:
|
||||||
|
self.log.warning(
|
||||||
|
'The --profile option is deprecated, '
|
||||||
|
'please use --os-profile instead'
|
||||||
|
)
|
||||||
|
if not self.options.profile:
|
||||||
|
self.options.profile = self.options.old_profile
|
||||||
|
|
||||||
self.do_profile = osprofiler_profiler and self.options.profile
|
self.do_profile = osprofiler_profiler and self.options.profile
|
||||||
if self.do_profile:
|
if self.do_profile:
|
||||||
osprofiler_profiler.init(self.options.profile)
|
osprofiler_profiler.init(self.options.profile)
|
||||||
|
@ -144,7 +155,7 @@ class OpenStackShell(app.App):
|
||||||
# bigger than most big default one (CRITICAL) or something like
|
# bigger than most big default one (CRITICAL) or something like
|
||||||
# that (PROFILE = 60 for instance), but not sure we need it here.
|
# that (PROFILE = 60 for instance), but not sure we need it here.
|
||||||
self.log.warning("Trace ID: %s" % trace_id)
|
self.log.warning("Trace ID: %s" % trace_id)
|
||||||
self.log.warning("To display trace use next command:\n"
|
self.log.warning("Display trace with command:\n"
|
||||||
"osprofiler trace show --html %s " % trace_id)
|
"osprofiler trace show --html %s " % trace_id)
|
||||||
|
|
||||||
def run_subcommand(self, argv):
|
def run_subcommand(self, argv):
|
||||||
|
@ -242,16 +253,22 @@ class OpenStackShell(app.App):
|
||||||
|
|
||||||
# osprofiler HMAC key argument
|
# osprofiler HMAC key argument
|
||||||
if osprofiler_profiler:
|
if osprofiler_profiler:
|
||||||
parser.add_argument('--profile',
|
parser.add_argument(
|
||||||
metavar='hmac-key',
|
'--os-profile',
|
||||||
help='HMAC key to use for encrypting context '
|
metavar='hmac-key',
|
||||||
'data for performance profiling of operation. '
|
dest='profile',
|
||||||
'This key should be the value of one of the '
|
help='HMAC key for encrypting profiling context data',
|
||||||
'HMAC keys configured in osprofiler '
|
)
|
||||||
'middleware in the projects user would like '
|
# NOTE(dtroyer): This global option should have been named
|
||||||
'to profile. It needs to be specified in '
|
# --os-profile as --profile interferes with at
|
||||||
'configuration files of the required '
|
# least one existing command option. Deprecate
|
||||||
'projects.')
|
# --profile and remove after Apr 2017.
|
||||||
|
parser.add_argument(
|
||||||
|
'--profile',
|
||||||
|
metavar='hmac-key',
|
||||||
|
dest='old_profile',
|
||||||
|
help=argparse.SUPPRESS,
|
||||||
|
)
|
||||||
|
|
||||||
return clientmanager.build_plugin_option_parser(parser)
|
return clientmanager.build_plugin_option_parser(parser)
|
||||||
|
|
||||||
|
|
|
@ -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),
|
||||||
'--profile': ('SECRET_KEY', True, False),
|
'--os-profile': ('SECRET_KEY', True, False),
|
||||||
'--os-interface': (DEFAULT_INTERFACE, True, True)
|
'--os-interface': (DEFAULT_INTERFACE, True, True)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue