starlingx/openstack-armada-app
Code Issues Proposed changes

Merge "Fixing cloudformation overrides"

Browse Source
This commit is contained in:
Zuul
2022-03-28 22:49:31 +00:00
committed by Gerrit Code Review
parent 9b4cc7ce60 02e769a833
commit a5420b6d5d
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

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