openstack
/
shade
Code Issues Proposed changes

Merge "Backport connect_as fix from openstacksdk"

This commit is contained in:
Zuul 2018-04-27 12:56:11 +00:00 committed by Gerrit Code Review
parent f5e8ac20c7 94c1ac842d
commit 2a59fb58f2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shade/openstackcloud.py
View File

@ -321,10 +321,13 @@ class OpenStackCloud(
that do not want to be overridden can be ommitted.
"""
config = os_client_config.OpenStackConfig(
app_name=self.cloud_config._app_name,
app_version=self.cloud_config._app_version,
load_yaml_config=False)
if self.cloud_config._openstack_config:
config = self.cloud_config._openstack_config
else:
config = os_client_config.OpenStackConfig(
app_name=self.cloud_config._app_name,
app_version=self.cloud_config._app_version,
load_yaml_config=False)
params = copy.deepcopy(self.cloud_config.config)
# Remove profile from current cloud so that overridding works
params.pop('profile', None)
@ -362,9 +365,7 @@ class OpenStackCloud(
# Constructor, otherwise the new auth plugin doesn't get used.
return keystoneauth1.session.Session(session=self.keystone_session)
# Use cloud='defaults' so that we overlay settings properly
cloud_config = config.get_one_cloud(
cloud='defaults',
session_constructor=session_constructor,
**params)
# Override the cloud name so that logging/location work right