starlingx/openstack-armada-app
Code Issues Proposed changes

Fixing cloudformation overrides

Browse Source 
The cloudformation secrets overrides were misplaced inside the
orchestration key.

Reference:
https://github.com/openstack/openstack-helm/blob/master/heat/values.yaml#L803

Story: 2009891
Task: 44673

Signed-off-by: Thiago Brito <thiago.brito@windriver.com>
Change-Id: I05126f1f47dd9152cb2b2102018c50f5640c31ce
This commit is contained in:
Thiago Brito
2022-03-21 09:18:06 -03:00
parent 53f7d158b8
commit 02e769a833
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/heat.py
View File

@@ -134,10 +134,12 @@ class HeatHelm(openstack.OpenstackBaseHelm):
'tls': {
'orchestration': {
'api': {
'internal': 'heat-tls-public'
'internal': 'heat-tls-public',
},
},
'cloudformation': {
'cfn': {
'internal': 'heat-tls-public'
'internal': 'cloudformation-tls-public',
}
}
}

2
python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone.py
View File

@@ -309,7 +309,7 @@ class KeystoneHelm(openstack.OpenstackBaseHelm):
'tls': {
'identity': {
'api': {
'internal': 'keystone-tls-public'
'internal': 'keystone-tls-public',
}
}
}

14
python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/tests/helm/test_heat.py
View File

@@ -175,6 +175,20 @@ class HeatGetOverrideTest(HeatHelmTestCase,
},
},
},
'secrets': {
'tls': {
'orchestration': {
'api': {
'internal': 'heat-tls-public',
},
},
'cloudformation': {
'cfn': {
'internal': 'cloudformation-tls-public',
},
},
},
},
'manifests': {
'certificates': True,
},