starlingx
/
config
Code Issues Proposed changes

Fix sanity issue during controller unlock 

A recent commit merged without rebasing to a new method signature
 https://review.opendev.org/#/c/657383/

This impacts the ability to do a host-unlock in certain
scenarios.

Change-Id: Ia5d71689c79762f7fcdcd0734c205f73e983cdf0
Closes-Bug: 1832237
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2019-06-10 09:23:50 -05:00
parent cfa69ee317
commit 22cfb0e699
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,8 +115,11 @@ class CephPuppet(openstack.OpenstackBasePuppet):
}
if utils.is_openstack_applied(self.dbapi):
app = self.dbapi.kube_app_get(constants.HELM_APP_OPENSTACK)
override = self.dbapi.helm_override_get(
self.SERVICE_NAME_RGW, common.HELM_NS_OPENSTACK)
app.id,
self.SERVICE_NAME_RGW,
common.HELM_NS_OPENSTACK)
password = override.system_overrides.get(
self.SERVICE_NAME_RGW, None)
if password: