starlingx/snmp-armada-app
Code Issues Proposed changes

Merge "Use FQDN for MGMT network"

Browse Source
This commit is contained in:
Zuul 2023-11-02 20:41:19 +00:00 committed by Gerrit Code Review
commit 3888fc4094
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/helm/snmp.py
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2020-2022 Wind River Systems, Inc. # Copyright (c) 2020-2023 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -14,6 +14,7 @@ from six import ensure_text
from six import string_types from six import string_types
from sysinv.common import constants from sysinv.common import constants
from sysinv.common import exception from sysinv.common import exception
from sysinv.common import utils
from sysinv.db import api from sysinv.db import api
from sysinv.helm import base from sysinv.helm import base
from sysinv.helm import common from sysinv.helm import common
@ -71,7 +72,9 @@ class SnmpHelm(base.BaseHelm):
return ret_password return ret_password
def _get_database_connection(self): 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( auth_password = self._get_keyring_password(
self.SERVICE_FM_NAME, 'database') self.SERVICE_FM_NAME, 'database')
connection = "postgresql://%s:%s@%s/%s" %\ connection = "postgresql://%s:%s@%s/%s" %\