starlingx/config
Code Issues Proposed changes

Merge "A bug in swift containerization was breaking provisioning"

Browse Source
This commit is contained in:
Zuul 2019-06-07 20:20:58 +00:00 committed by Gerrit Code Review
commit 97b3a5ad40
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(), 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( override = self.dbapi.helm_override_get(
self.SERVICE_NAME_RGW, common.HELM_NS_OPENSTACK) self.SERVICE_NAME_RGW, common.HELM_NS_OPENSTACK)
password = override.system_overrides.get( 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(), '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'] = \ config['openstack::keystone::params::openstack_auth_uri'] = \
self.get_openstack_auth_uri() self.get_openstack_auth_uri()