Fix shell saving OpenStackConfig object
When this was brough over from OSC we did not save the OpenStackConfig object created in shell.initialize_app(). Others have come to rely on it being in shell.cloud_config so save it. Change-Id: I1a82cd94febb1775bcd9fae05d5d5ed860c5baa7
This commit is contained in:
parent
27117c6157
commit
473f4fc32d
@ -375,7 +375,7 @@ class OpenStackShell(app.App):
|
|||||||
# Ignore the default value of interface. Only if it is set later
|
# Ignore the default value of interface. Only if it is set later
|
||||||
# will it be used.
|
# will it be used.
|
||||||
try:
|
try:
|
||||||
cc = cloud_config.OSC_Config(
|
self.cloud_config = cloud_config.OSC_Config(
|
||||||
override_defaults={
|
override_defaults={
|
||||||
'interface': None,
|
'interface': None,
|
||||||
'auth_type': self._auth_type,
|
'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
|
# NOTE(dtroyer): Need to do this with validate=False to defer the
|
||||||
# auth plugin handling to ClientManager.setup_auth()
|
# 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,
|
cloud=self.options.cloud,
|
||||||
argparse=self.options,
|
argparse=self.options,
|
||||||
validate=False,
|
validate=False,
|
||||||
@ -401,7 +401,7 @@ class OpenStackShell(app.App):
|
|||||||
|
|
||||||
self.log_configurator.configure(self.cloud)
|
self.log_configurator.configure(self.cloud)
|
||||||
self.dump_stack_trace = self.log_configurator.dump_trace
|
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",
|
self.log.debug("cloud cfg: %s",
|
||||||
strutils.mask_password(self.cloud.config))
|
strutils.mask_password(self.cloud.config))
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user