openstack/osc-lib
Code Issues Proposed changes

Merge "Prompt for auth options"

Browse Source
This commit is contained in:
Jenkins 2016-08-30 17:14:13 +00:00 committed by Gerrit Code Review
commit d7c8789933
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osc_lib/cli/client_config.py
View File

@ -148,7 +148,7 @@ class OSC_Config(config.OpenStackConfig):
LOG.debug("auth_config_hook(): %s" % config)
return config
# TODO(dtroyer): un-hackify all of the below when o-c-c 1.19.x is
# TODO(dtroyer): un-hackify all of the below when o-c-c 1.21.x is
# the minimum in global-requirements
def get_one_cloud(self, cloud=None, validate=True,
@ -216,4 +216,10 @@ class OSC_Config(config.OpenStackConfig):
else:
config['auth'][p_opt.dest] = winning_value
# NOTE(dtroyer): If os-client-config is 1.21.0 or newer it will
# have an option_prompt() method to handle prompts
if 'option_prompt' in self:
# See if this needs a prompting
config = self.option_prompt(config, p_opt)
return config