From 2f1714af4e93ec6c404dc13c261cf1a84fd85d9a Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Fri, 7 Jun 2019 13:05:42 -0500 Subject: [PATCH] A bug in swift containerization was breaking provisioning 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 --- sysinv/sysinv/sysinv/sysinv/puppet/ceph.py | 2 +- sysinv/sysinv/sysinv/sysinv/puppet/keystone.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/ceph.py b/sysinv/sysinv/sysinv/sysinv/puppet/ceph.py index a0ec896767..d9784c6cee 100644 --- a/sysinv/sysinv/sysinv/sysinv/puppet/ceph.py +++ b/sysinv/sysinv/sysinv/sysinv/puppet/ceph.py @@ -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( diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/keystone.py b/sysinv/sysinv/sysinv/sysinv/puppet/keystone.py index 9465af6f2c..07e7a442fd 100644 --- a/sysinv/sysinv/sysinv/sysinv/puppet/keystone.py +++ b/sysinv/sysinv/sysinv/sysinv/puppet/keystone.py @@ -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()