Merge "Using general naming for app openstack"
This commit is contained in:
commit
a15f9388c9
|
@ -57,7 +57,7 @@ SUBCLOUD_STATE_UPDATE_ITERATIONS = \
|
|||
# trigger_patch_audit.
|
||||
|
||||
# Name of starlingx openstack helm application
|
||||
HELM_APP_OPENSTACK = 'stx-openstack'
|
||||
HELM_APP_OPENSTACK = 'openstack'
|
||||
|
||||
# Every 4 audits triggers a kubernetes audit
|
||||
KUBERNETES_AUDIT_RATE = 4
|
||||
|
@ -362,7 +362,7 @@ class SubcloudAuditManager(manager.Manager):
|
|||
# would require changes to handle this gracefully.
|
||||
# apps = sysinv_client.get_applications()
|
||||
# for app in apps:
|
||||
# if app.name == HELM_APP_OPENSTACK and app.active:
|
||||
# if app.name.endswith(HELM_APP_OPENSTACK):
|
||||
# do_openstack_audit = True
|
||||
# break
|
||||
|
||||
|
|
|
@ -256,7 +256,7 @@ class SubcloudAuditWorkerManager(manager.Manager):
|
|||
return
|
||||
|
||||
for app in apps:
|
||||
if app.name == HELM_APP_OPENSTACK and app.active:
|
||||
if app.name.endswith(HELM_APP_OPENSTACK) and app.active:
|
||||
# audit find openstack app is installed and active in
|
||||
# the subcloud
|
||||
openstack_installed_current = True
|
||||
|
|
Loading…
Reference in New Issue