Merge "Refresh service links for new major release"
This commit is contained in:
Zuul
Gerrit Code Review
commit
7ef2301907
software
@ -21,12 +21,32 @@ INITIAL_CONFIG_COMPLETE="/etc/platform/.initial_config_complete"
|
||||
SERVICE_NAME="usm-initialize.service"
|
||||
PXELINUX_SYMLINK="/var/pxeboot/pxelinux.cfg"
|
||||
|
||||
. /etc/platform/platform.conf
|
||||
export controller=false
|
||||
export worker=false
|
||||
export storage=false
|
||||
|
||||
if [ "${nodetype}" == "controller" ]; then
|
||||
controller=true
|
||||
if [ "${subfunction}" == "controller,worker" ]; then
|
||||
worker=true
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${nodetype}" == "worker" ]; then
|
||||
worker=true
|
||||
fi
|
||||
|
||||
if [ "${nodetype}" == "storage" ]; then
|
||||
storage=true
|
||||
fi
|
||||
|
||||
log() {
|
||||
echo "`date "+%FT%T.%3N"`: $0: $*" >> $logfile
|
||||
}
|
||||
|
||||
set_presets() {
|
||||
. /etc/platform/platform.conf
|
||||
log "apply preset"
|
||||
if [ "${system_type}" == "All-in-one" ] ; then
|
||||
log "AIO System"
|
||||
if [[ "${subfunction}" =~ "lowlatency" ]] ; then
|
||||
@ -56,6 +76,96 @@ set_presets() {
|
||||
systemctl preset-all --preset-mode=full
|
||||
}
|
||||
|
||||
refresh_init_links() {
|
||||
log "setup goenable and host config"
|
||||
# below should be identical to kickstart.cfg operations, as if setting up from a fresh install
|
||||
if [ ! "${controller}" = true -a "${worker}" = true ] ; then
|
||||
ln -s /etc/goenabled.d/config_goenabled_check.sh.worker /etc/goenabled.d/config_goenabled_check.sh
|
||||
ln -s /dev/null /etc/systemd/system/controllerconfig.service
|
||||
ln -s /dev/null /etc/systemd/system/storageconfig.service
|
||||
elif [ "${storage}" = true ] ; then
|
||||
ln -s /etc/goenabled.d/config_goenabled_check.sh.storage /etc/goenabled.d/config_goenabled_check.sh
|
||||
ln -s /dev/null /etc/systemd/system/controllerconfig.service
|
||||
ln -s /dev/null /etc/systemd/system/workerconfig.service
|
||||
elif [ "${controller}" = true ] ; then
|
||||
ln -s /etc/goenabled.d/config_goenabled_check.sh.controller /etc/goenabled.d/config_goenabled_check.sh
|
||||
ln -s /dev/null /etc/systemd/system/workerconfig.service
|
||||
ln -s /dev/null /etc/systemd/system/storageconfig.service
|
||||
fi
|
||||
|
||||
chmod 700 /etc/goenabled.d/config_goenabled_check.sh
|
||||
|
||||
log "Refresh /etc/pmon.d"
|
||||
rm -rf /etc/pmon.d
|
||||
mkdir /etc/pmon.d -p
|
||||
|
||||
# below create pmon link for new pmon monitored daemons
|
||||
if [ "${controller}" = true ] ; then
|
||||
ln -s /usr/share/starlingx/pmon.d/acpid.conf /etc/pmon.d/acpid.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/containerd.conf /etc/pmon.d/containerd.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/docker.conf /etc/pmon.d/docker.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/fm-api.conf /etc/pmon.d/fm-api.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/fsmon.conf /etc/pmon.d/fsmon.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/hbsAgent.conf /etc/pmon.d/hbsAgent.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/hbsClient.conf /etc/pmon.d/hbsClient.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/lmon.conf /etc/pmon.d/lmon.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/logmgmt /etc/pmon.d/logmgmt
|
||||
ln -s /usr/share/starlingx/pmon.d/mtcClient.conf /etc/pmon.d/mtcClient.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/mtcalarm.conf /etc/pmon.d/mtcalarm.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/mtclogd.conf /etc/pmon.d/mtclogd.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sm-api.conf /etc/pmon.d/sm-api.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sm-eru.conf /etc/pmon.d/sm-eru.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sm.conf /etc/pmon.d/sm.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sshd.conf /etc/pmon.d/sshd.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sssd.conf /etc/pmon.d/sssd.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sw-patch-agent.conf /etc/pmon.d/sw-patch-agent.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sw-patch-controller-daemon.conf /etc/pmon.d/sw-patch-controller-daemon.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sysinv-agent.conf /etc/pmon.d/sysinv-agent.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/syslog-ng.conf /etc/pmon.d/syslog-ng.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/luks.conf /etc/pmon.d/luks.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/ipsec-server.conf /etc/pmon.d/ipsec-server.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/software-controller-daemon.conf /etc/pmon.d/software-controller-daemon.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/software-agent.conf /etc/pmon.d/software-agent.conf
|
||||
fi
|
||||
if [ "${worker}" = true ] ; then
|
||||
ln -s /usr/share/starlingx/pmon.d/acpid.conf /etc/pmon.d/acpid.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/containerd.conf /etc/pmon.d/containerd.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/docker.conf /etc/pmon.d/docker.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/fsmon.conf /etc/pmon.d/fsmon.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/hbsClient.conf /etc/pmon.d/hbsClient.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/isolcpu_plugin.conf /etc/pmon.d/isolcpu_plugin.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/lmon.conf /etc/pmon.d/lmon.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/logmgmt /etc/pmon.d/logmgmt
|
||||
ln -s /usr/share/starlingx/pmon.d/mtcClient.conf /etc/pmon.d/mtcClient.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/mtcalarm.conf /etc/pmon.d/mtcalarm.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/mtclogd.conf /etc/pmon.d/mtclogd.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sm-eru.conf /etc/pmon.d/sm-eru.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sshd.conf /etc/pmon.d/sshd.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sssd.conf /etc/pmon.d/sssd.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sw-patch-agent.conf /etc/pmon.d/sw-patch-agent.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sysinv-agent.conf /etc/pmon.d/sysinv-agent.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/syslog-ng.conf /etc/pmon.d/syslog-ng.conf
|
||||
fi
|
||||
if [ "${storage}" = true ] ; then
|
||||
ln -s /usr/share/starlingx/pmon.d/acpid.conf /etc/pmon.d/acpid.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/containerd.conf /etc/pmon.d/containerd.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/docker.conf /etc/pmon.d/docker.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/fsmon.conf /etc/pmon.d/fsmon.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/hbsClient.conf /etc/pmon.d/hbsClient.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/lmon.conf /etc/pmon.d/lmon.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/logmgmt /etc/pmon.d/logmgmt
|
||||
ln -s /usr/share/starlingx/pmon.d/mtcClient.conf /etc/pmon.d/mtcClient.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/mtcalarm.conf /etc/pmon.d/mtcalarm.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/mtclogd.conf /etc/pmon.d/mtclogd.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sm-eru.conf /etc/pmon.d/sm-eru.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sshd.conf /etc/pmon.d/sshd.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sssd.conf /etc/pmon.d/sssd.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sw-patch-agent.conf /etc/pmon.d/sw-patch-agent.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/sysinv-agent.conf /etc/pmon.d/sysinv-agent.conf
|
||||
ln -s /usr/share/starlingx/pmon.d/syslog-ng.conf /etc/pmon.d/syslog-ng.conf
|
||||
fi
|
||||
}
|
||||
|
||||
reset_initial_config_complete() {
|
||||
if [[ -f ${INITIAL_CONFIG_COMPLETE} ]]; then
|
||||
log "Removing ${INITIAL_CONFIG_COMPLETE}"
|
||||
@ -82,6 +192,7 @@ remove_pxelinux_symlink() {
|
||||
|
||||
start() {
|
||||
set_presets
|
||||
refresh_init_links
|
||||
reset_initial_config_complete
|
||||
disable_service
|
||||
remove_pxelinux_symlink
|
||||
|
||||
@ -18,29 +18,37 @@ import software.utils as utils
|
||||
|
||||
class BaseHook(object):
|
||||
"""Base Hook object"""
|
||||
DEPLOYED_OSTREE_DIR = "/ostree/1"
|
||||
SYSTEMD_LIB_DIR = "/lib/systemd/system"
|
||||
SYSTEMD_ETC_DIR = "%s/etc/systemd/system/multi-user.target.wants" % DEPLOYED_OSTREE_DIR
|
||||
|
||||
def __init__(self, attrs=None):
|
||||
pass
|
||||
|
||||
def run(self):
|
||||
pass
|
||||
|
||||
def enable_service(self, service):
|
||||
src = "%s/%s" % (self.SYSTEMD_LIB_DIR, service)
|
||||
dst = "%s/%s" % (self.SYSTEMD_ETC_DIR, service)
|
||||
# Add check to enable reentrant
|
||||
if not os.path.islink(dst):
|
||||
try:
|
||||
os.symlink(src, dst)
|
||||
LOG.info("Enabled %s" % service)
|
||||
except subprocess.CalledProcessError as e:
|
||||
LOG.exception("Error enabling %s: %s" % (service, str(e)))
|
||||
raise
|
||||
|
||||
|
||||
class UsmInitHook(BaseHook):
|
||||
def run(self):
|
||||
cmd = "systemctl enable usm-initialize.service"
|
||||
try:
|
||||
subprocess.check_call(cmd, shell=True)
|
||||
except subprocess.CalledProcessError as e:
|
||||
LOG.exception("Error enabling usm-initialize.service: %s" % str(e))
|
||||
raise
|
||||
self.enable_service("usm-initialize.service")
|
||||
LOG.info("Enabled usm-initialize.service on next reboot")
|
||||
|
||||
|
||||
class EnableNewServicesHook(BaseHook):
|
||||
SYSTEM_PRESET_DIR = "/etc/systemd/system-preset"
|
||||
DEPLOYED_OSTREE_DIR = "/ostree/1"
|
||||
SYSTEMD_LIB_DIR = "/lib/systemd/system"
|
||||
SYSTEMD_ETC_DIR = "%s/etc/systemd/system/multi-user.target.wants" % DEPLOYED_OSTREE_DIR
|
||||
|
||||
def find_new_services(self):
|
||||
# get preset name
|
||||
@ -71,14 +79,7 @@ class EnableNewServicesHook(BaseHook):
|
||||
|
||||
def enable_new_services(self, services):
|
||||
for service in services:
|
||||
src = "%s/%s" % (self.SYSTEMD_LIB_DIR, service)
|
||||
dst = "%s/%s" % (self.SYSTEMD_ETC_DIR, service)
|
||||
try:
|
||||
os.symlink(src, dst)
|
||||
LOG.info("Enabled %s" % service)
|
||||
except subprocess.CalledProcessError as e:
|
||||
LOG.exception("Error enabling %s: %s" % (service, str(e)))
|
||||
raise
|
||||
self.enable_service(service)
|
||||
|
||||
def run(self):
|
||||
new_services = self.find_new_services()
|
||||
@ -234,22 +235,26 @@ AGENT_HOOKS = {
|
||||
MAJOR_RELEASE_UPGRADE: {
|
||||
PRE: [
|
||||
CreateUSMUpgradeInProgressFlag,
|
||||
UsmInitHook,
|
||||
],
|
||||
POST: [
|
||||
CopyPxeFilesHook,
|
||||
ReconfigureKernelHook,
|
||||
EnableNewServicesHook,
|
||||
# enable usm-initialize service for next reboot only
|
||||
# if everything else is done
|
||||
UsmInitHook,
|
||||
],
|
||||
},
|
||||
MAJOR_RELEASE_ROLLBACK: {
|
||||
PRE: [
|
||||
RemoveKubernetesConfigSymlinkHook,
|
||||
UsmInitHook,
|
||||
],
|
||||
POST: [
|
||||
ReconfigureKernelHook,
|
||||
RemoveCephMonHook,
|
||||
# enable usm-initialize service for next reboot only
|
||||
# if everything else is done
|
||||
UsmInitHook,
|
||||
],
|
||||
},
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user