openstack/osc-lib
Code Issues Proposed changes

Merge "Deprecate --profile and remove after Apr 2017"

Browse Source
This commit is contained in:
Jenkins 2017-07-05 19:23:27 +00:00 committed by Gerrit Code Review
commit 50cea39981
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osc_lib/shell.py
View File

@ -16,7 +16,6 @@
"""Command-line interface to the OpenStack APIs""" """Command-line interface to the OpenStack APIs"""
import argparse
import getpass import getpass
import locale import locale
import logging import logging
@ -148,16 +147,6 @@ 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)
@ -286,16 +275,6 @@ class OpenStackShell(app.App):
default=utils.env('OS_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
# --os-profile as --profile interferes with at
# least one existing command option. Deprecate
# --profile and remove after Apr 2017.
parser.add_argument(
'--profile',
metavar='hmac-key',
dest='old_profile',
help=argparse.SUPPRESS,
)
return parser return parser
# return clientmanager.build_plugin_option_parser(parser) # return clientmanager.build_plugin_option_parser(parser)