starlingx/update
Code Issues Proposed changes

Revert "expand sw_patch config check to other deploy types"

Browse Source 
This reverts commit c9d1a9f8c6.

Reason for revert: This commit is impacting USM on non-controller nodes in multi-node deployments (standard and storage) and according to the owner of this commit, this change is not needed and does not fix the issue it was intended to fix.

Change-Id: I74ce9e316a1d0806bdc32710e486fcba05538f90
This commit is contained in:
Heitor Matsui
2024-06-10 17:55:04 +00:00
committed by Gerrit Code Review
parent c9d1a9f8c6
commit 5b4266f393
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
software/software/config.py
View File

@@ -138,8 +138,12 @@ def get_mgmt_ip():
# the management IP for AIO-SX can be reconfigured during the startup. # the management IP for AIO-SX can be reconfigured during the startup.
# Check if /var/run/.<node>_config_complete exists to be sure that IP # Check if /var/run/.<node>_config_complete exists to be sure that IP
# address will be the correct mgmt IP # address will be the correct mgmt IP
if not os.path.exists(tsc.VOLATILE_CONTROLLER_CONFIG_COMPLETE): try:
if tsc.system_mode == constants.SYSTEM_MODE_SIMPLEX and \
not os.path.exists(tsc.VOLATILE_CONTROLLER_CONFIG_COMPLETE):
return None return None
except Exception:
logging.info("not able to get system_mode, continue sw-patch services")
mgmt_hostname = socket.gethostname() mgmt_hostname = socket.gethostname()
return utils.gethostbyname(mgmt_hostname) return utils.gethostbyname(mgmt_hostname)

7
sw-patch/cgcs-patch/cgcs_patch/config.py
View File

@@ -86,8 +86,13 @@ def get_mgmt_ip():
# the management IP for AIO-SX can be reconfigured during the startup. # the management IP for AIO-SX can be reconfigured during the startup.
# Check if /var/run/.<node>_config_complete exists to be sure that IP # Check if /var/run/.<node>_config_complete exists to be sure that IP
# address will be the correct mgmt IP # address will be the correct mgmt IP
if not os.path.exists(tsc.VOLATILE_CONTROLLER_CONFIG_COMPLETE): try:
if tsc.system_mode == constants.SYSTEM_MODE_SIMPLEX and \
not os.path.exists(tsc.VOLATILE_CONTROLLER_CONFIG_COMPLETE):
return None return None
except Exception:
logging.info("not able to get system_mode, continue sw-patch services")
mgmt_hostname = socket.gethostname() mgmt_hostname = socket.gethostname()
return utils.gethostbyname(mgmt_hostname) return utils.gethostbyname(mgmt_hostname)