7fef84e36e
During the management network reconfiguration, the system is restarted
to controller_config script runs the puppet code and update
all services to use the new mgmt IP address.
But the sw-patch services start before the controller_config.
When they start they get the mgmt_ip using the python socket lib that
uses the IP address from the /etc/hosts.
But /etc/hosts at that time is not updated yet, so it get the old
management network IP.
To fix this issue, the sw-patch services will wait for the puppet
code to be applied to make sure the /etc/hosts and new management
network IPs were installed in the system.
Tests done:
IPv4 AIO-SX fresh install
IPv4 AIO-DX fresh install
IPv4 DC with subcloud AIO-SX fresh install
IPv4 AIO-SX mgmt reconfig and apply a non-reboot-required patch
IPv4 AIO-SX mgmt reconfig and apply a reboot-required patch
IPv4 subcloud AIO-SX mgmt reconfig and apply a non-reboot-required patch
IPv4 subcloud AIO-SX mgmt reconfig and apply a reboot-required patch
For this test the sw-patch was in failed state after the reboot,
It happens even without the mgmt reconfig and this fix
Partial-Bug: #2060066
Story: 2010722
Task: 49827
Depends-On: https://review.opendev.org/c/starlingx/config/+/914710
Change-Id: Ie544425513ef4fede73b4b55770ad6857cdf7eed
Signed-off-by: Fabiano Correa Mercer <fabiano.correamercer@windriver.com>
137 lines
4.0 KiB
Python
137 lines
4.0 KiB
Python
"""
|
|
Copyright (c) 2014-2022 Wind River Systems, Inc.
|
|
|
|
SPDX-License-Identifier: Apache-2.0
|
|
|
|
"""
|
|
import configparser
|
|
import io
|
|
import logging
|
|
import os
|
|
import socket
|
|
|
|
import tsconfig.tsconfig as tsc
|
|
|
|
import cgcs_patch.utils as utils
|
|
import cgcs_patch.constants as constants
|
|
|
|
controller_mcast_group = None
|
|
agent_mcast_group = None
|
|
controller_port = 0
|
|
agent_port = 0
|
|
api_port = 0
|
|
mgmt_if = None
|
|
nodetype = None
|
|
platform_conf_mtime = 0
|
|
patching_conf_mtime = 0
|
|
patching_conf = '/etc/patching/patching.conf'
|
|
|
|
|
|
def read_config():
|
|
global patching_conf_mtime
|
|
global patching_conf
|
|
|
|
if patching_conf_mtime == os.stat(patching_conf).st_mtime:
|
|
# The file has not changed since it was last read
|
|
return
|
|
|
|
defaults = {
|
|
'controller_mcast_group': "239.1.1.3",
|
|
'agent_mcast_group': "239.1.1.4",
|
|
'api_port': "5487",
|
|
'controller_port': "5488",
|
|
'agent_port': "5489",
|
|
}
|
|
|
|
global controller_mcast_group
|
|
global agent_mcast_group
|
|
global api_port
|
|
global controller_port
|
|
global agent_port
|
|
|
|
config = configparser.ConfigParser(defaults)
|
|
|
|
config.read(patching_conf)
|
|
patching_conf_mtime = os.stat(patching_conf).st_mtime
|
|
|
|
controller_mcast_group = config.get('runtime',
|
|
'controller_multicast')
|
|
agent_mcast_group = config.get('runtime', 'agent_multicast')
|
|
|
|
api_port = config.getint('runtime', 'api_port')
|
|
controller_port = config.getint('runtime', 'controller_port')
|
|
agent_port = config.getint('runtime', 'agent_port')
|
|
|
|
# The platform.conf file has no section headers, which causes problems
|
|
# for ConfigParser. So we'll fake it out.
|
|
ini_str = '[platform_conf]\n' + open(tsc.PLATFORM_CONF_FILE, 'r').read()
|
|
ini_fp = io.StringIO(ini_str)
|
|
config.read_file(ini_fp)
|
|
|
|
try:
|
|
value = str(config.get('platform_conf', 'nodetype'))
|
|
|
|
global nodetype
|
|
nodetype = value
|
|
except configparser.Error:
|
|
logging.exception("Failed to read nodetype from config")
|
|
|
|
|
|
def get_mgmt_ip():
|
|
# Check if initial config is complete
|
|
if not os.path.exists(tsc.INITIAL_CONFIG_COMPLETE_FLAG):
|
|
return None
|
|
|
|
# Due to https://storyboard.openstack.org/#!/story/2010722
|
|
# 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
|
|
# address will be the correct mgmt IP
|
|
try:
|
|
if tsc.system_mode == constants.SYSTEM_MODE_SIMPLEX and \
|
|
not os.path.exists(tsc.VOLATILE_CONTROLLER_CONFIG_COMPLETE):
|
|
return None
|
|
except Exception:
|
|
logging.info("not able to get system_mode, continue sw-patch services")
|
|
|
|
mgmt_hostname = socket.gethostname()
|
|
return utils.gethostbyname(mgmt_hostname)
|
|
|
|
|
|
# Because the patching daemons are launched before manifests are
|
|
# applied, the content of some settings in platform.conf can change,
|
|
# such as the management interface. As such, we can't just directly
|
|
# use tsc.management_interface
|
|
#
|
|
def get_mgmt_iface():
|
|
# Check if initial config is complete
|
|
if not os.path.exists(constants.INITIAL_CONFIG_COMPLETE_FLAG):
|
|
return None
|
|
|
|
global mgmt_if
|
|
global platform_conf_mtime
|
|
|
|
if mgmt_if is not None and \
|
|
platform_conf_mtime == os.stat(tsc.PLATFORM_CONF_FILE).st_mtime:
|
|
# The platform.conf file hasn't been modified since we read it,
|
|
# so return the cached value.
|
|
return mgmt_if
|
|
|
|
config = configparser.ConfigParser()
|
|
|
|
# The platform.conf file has no section headers, which causes problems
|
|
# for ConfigParser. So we'll fake it out.
|
|
ini_str = '[platform_conf]\n' + open(tsc.PLATFORM_CONF_FILE, 'r').read()
|
|
ini_fp = io.StringIO(ini_str)
|
|
config.read_file(ini_fp)
|
|
|
|
try:
|
|
value = str(config.get('platform_conf', 'management_interface'))
|
|
|
|
mgmt_if = value
|
|
|
|
platform_conf_mtime = os.stat(tsc.PLATFORM_CONF_FILE).st_mtime
|
|
except configparser.Error:
|
|
logging.exception("Failed to read management_interface from config")
|
|
return None
|
|
return mgmt_if
|