starlingx
/
openstack-armada-app
Code Issues Proposed changes

Merge "Use FQDN for MGMT network"

This commit is contained in:
Zuul 2023-11-06 18:51:27 +00:00 committed by Gerrit Code Review
parent 9b0fbb30f0 3d16b9f5e3
commit 374fbd76e0
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/keystone_api_proxy.py
View File

@ -1,12 +1,12 @@
#
# Copyright (c) 2019-2020 Wind River Systems, Inc.
# Copyright (c) 2019-2023 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
from sysinv.common import constants
from sysinv.common import exception
from sysinv.common import utils
from sysinv.helm import common
from k8sapp_openstack.common import constants as app_constants
@ -97,13 +97,17 @@ class KeystoneApiProxyHelm(openstack.OpenstackBaseHelm):
}
def _get_transport_url(self):
host_url = self._format_url_address(self._get_management_address())
host_url = (constants.CONTROLLER_FQDN if utils.is_fqdn_ready_to_use()
else self._format_url_address(self._get_management_address()))
auth_password = self._get_keyring_password('amqp', 'rabbit')
transport_url = "rabbit://guest:%s@%s:5672" % (auth_password, host_url)
return transport_url
def _get_database_connection(self):
host_url = self._format_url_address(self._get_management_address())
host_url = (constants.CONTROLLER_FQDN if utils.is_fqdn_ready_to_use()
else self._format_url_address(self._get_management_address()))
auth_password = self._get_keyring_password(
self.DCORCH_SERVICE_NAME, 'database')
connection = "postgresql+psycopg2://admin-dcorch:%s@%s/dcorch" %\

8
python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova_api_proxy.py
View File

@ -1,10 +1,12 @@
#
# Copyright (c) 2019-2020 Wind River Systems, Inc.
# Copyright (c) 2019-2023 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
from sysinv.common import constants
from sysinv.common import exception
from sysinv.common import utils
from sysinv.helm import common
from k8sapp_openstack.common import constants as app_constants
@ -38,7 +40,9 @@ class NovaApiProxyHelm(openstack.OpenstackBaseHelm):
'conf': {
'nova_api_proxy': {
'DEFAULT': {
'nfvi_compute_listen': self._get_management_address()
'nfvi_compute_listen': (constants.CONTROLLER_FQDN
if utils.is_fqdn_ready_to_use()
else self._get_management_address())
},
}
},

16
python3-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/swift.py
View File

@ -1,10 +1,12 @@
#
# Copyright (c) 2019-2020 Wind River Systems, Inc.
# Copyright (c) 2019-2023 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
from sysinv.common import constants
from sysinv.common import exception
from sysinv.common import utils
from sysinv.helm import common
from k8sapp_openstack.common import constants as app_constants
@ -37,14 +39,20 @@ class SwiftHelm(openstack.OpenstackBaseHelm):
return overrides
def _get_object_store_overrides(self):
return {
bind_host = (constants.CONTROLLER_FQDN
if utils.is_fqdn_ready_to_use()
else self._get_management_address())
host_dict = {
'hosts': {
'default': 'null',
'admin': self._get_management_address(),
'internal': self._get_management_address(),
'admin': bind_host,
'internal': bind_host,
'public': self._get_oam_address()
},
}
return host_dict
def _get_endpoints_overrides(self):
return {