starlingx/config
Code Issues Proposed changes

Add https helm override for Barbican and Heat

Browse Source 
This commit adds helm override for Barbican and Heat to set the
public endpoints with https and fqdn settings.

Partial-Bug: 1826583

Change-Id: I01e4326108b3cf4c731c2b12f800b09bc595162a
Signed-off-by: Teresa Ho <teresa.ho@windriver.com>
This commit is contained in:
Teresa Ho 2019-07-10 14:57:17 -04:00
parent c57f93a2d3
commit 7dc0b2d9fa
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sysinv/sysinv/sysinv/sysinv/helm/barbican.py
View File

@ -42,8 +42,13 @@ class BarbicanHelm(openstack.OpenstackBaseHelm):
'identity': { 'identity': {
'auth': self._get_endpoints_identity_overrides( 'auth': self._get_endpoints_identity_overrides(
self.SERVICE_NAME, self.AUTH_USERS), self.SERVICE_NAME, self.AUTH_USERS),
'host_fqdn_override': self._get_endpoints_host_fqdn_overrides( },
self.SERVICE_NAME) 'key_manager': {
'host_fqdn_override':
self._get_endpoints_host_fqdn_overrides(
self.SERVICE_NAME),
'port': self._get_endpoints_port_api_public_overrides(),
'scheme': self._get_endpoints_scheme_public_overrides(),
}, },
'oslo_db': { 'oslo_db': {
'auth': self._get_endpoints_oslo_db_overrides( 'auth': self._get_endpoints_oslo_db_overrides(

14
sysinv/sysinv/sysinv/sysinv/helm/heat.py
View File

@ -53,6 +53,20 @@ class HeatHelm(openstack.OpenstackBaseHelm):
'auth': self._get_endpoints_identity_overrides( 'auth': self._get_endpoints_identity_overrides(
self.SERVICE_NAME, self.AUTH_USERS), self.SERVICE_NAME, self.AUTH_USERS),
}, },
'cloudformation': {
'host_fqdn_override':
self._get_endpoints_host_fqdn_overrides(
'cloudformation'),
'port': self._get_endpoints_port_api_public_overrides(),
'scheme': self._get_endpoints_scheme_public_overrides(),
},
'orchestration': {
'host_fqdn_override':
self._get_endpoints_host_fqdn_overrides(
self.SERVICE_NAME),
'port': self._get_endpoints_port_api_public_overrides(),
'scheme': self._get_endpoints_scheme_public_overrides(),
},
'oslo_db': { 'oslo_db': {
'auth': self._get_endpoints_oslo_db_overrides( 'auth': self._get_endpoints_oslo_db_overrides(
self.SERVICE_NAME, [self.SERVICE_NAME]) self.SERVICE_NAME, [self.SERVICE_NAME])