openstack
/
osc-lib
Code Issues Proposed changes

Merge "Fix shell saving OpenStackConfig object"

This commit is contained in:
Jenkins 2017-05-04 06:19:37 +00:00 committed by Gerrit Code Review
parent 57b3f937cd 473f4fc32d
commit 361789fb59
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osc_lib/shell.py
View File

@ -375,7 +375,7 @@ class OpenStackShell(app.App):
# Ignore the default value of interface. Only if it is set later
# will it be used.
try:
cc = cloud_config.OSC_Config(
self.cloud_config = cloud_config.OSC_Config(
override_defaults={
'interface': None,
'auth_type': self._auth_type,
@ -393,7 +393,7 @@ class OpenStackShell(app.App):
# NOTE(dtroyer): Need to do this with validate=False to defer the
# auth plugin handling to ClientManager.setup_auth()
self.cloud = cc.get_one_cloud(
self.cloud = self.cloud_config.get_one_cloud(
cloud=self.options.cloud,
argparse=self.options,
validate=False,
@ -401,7 +401,7 @@ class OpenStackShell(app.App):
self.log_configurator.configure(self.cloud)
self.dump_stack_trace = self.log_configurator.dump_trace
self.log.debug("defaults: %s", cc.defaults)
self.log.debug("defaults: %s", self.cloud_config.defaults)
self.log.debug("cloud cfg: %s",
strutils.mask_password(self.cloud.config))