starlingx/config
Code Issues Proposed changes

A bug in swift containerization was breaking provisioning

Browse Source 
A method that swift containerization was invoking had been renamed,
but the code was not updated when it was rebased.  This broke
the provisioning stage, even when swift was not being used.

Change-Id: Ia987174adfa78f6cc92eab96cf72483836750c53
Closes-Bug: #1832025
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2019-06-07 13:05:42 -05:00
parent 54cda51f68
commit 2f1714af4e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysinv/sysinv/sysinv/sysinv/puppet/ceph.py
View File

@ -114,7 +114,7 @@ class CephPuppet(openstack.OpenstackBasePuppet):
self._get_service_tenant_name(),
}
if utils.is_openstack_installed(self.dbapi):
if utils.is_openstack_applied(self.dbapi):
override = self.dbapi.helm_override_get(
self.SERVICE_NAME_RGW, common.HELM_NS_OPENSTACK)
password = override.system_overrides.get(

2
sysinv/sysinv/sysinv/sysinv/puppet/keystone.py
View File

@ -127,7 +127,7 @@ class KeystonePuppet(openstack.OpenstackBasePuppet):
'CONFIG_KEYSTONE_ADMIN_USERNAME': self.get_admin_user_name(),
}
if utils.is_openstack_installed(self.dbapi):
if utils.is_openstack_applied(self.dbapi):
config['openstack::keystone::params::openstack_auth_uri'] = \
self.get_openstack_auth_uri()