starlingx
/
config
Code Issues Proposed changes

Merge "Report port and device inventory after the worker manifest"

This commit is contained in:
Zuul 2024-03-26 16:15:05 +00:00 committed by Gerrit Code Review
parent 99bcb3314f 933d3a3a73
commit 5c1569362b
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sysinv/sysinv/sysinv/sysinv/agent/manager.py
View File

@ -224,7 +224,8 @@ class AgentManager(service.PeriodicService):
self._first_grub_update = False
self._inventoried_initial = False
self._inventory_reported = set()
self._first_boot_flag = os.path.exists(FIRST_BOOT_FLAG)
self._first_boot_flag = os.path.exists(FIRST_BOOT_FLAG) or \
os.path.exists(constants.VOLATILE_FIRST_BOOT_FLAG)
def start(self):
super(AgentManager, self).start()
@ -579,6 +580,14 @@ class AgentManager(service.PeriodicService):
host_uuid,
msg_dict)
if os.path.exists(FIRST_BOOT_FLAG):
# Create volatile first_boot file, that will be checked by agent manager
# when it get crashed and restarted, so that it will know this boot is still
# first boot.
try:
os.mknod(constants.VOLATILE_FIRST_BOOT_FLAG)
except OSError:
LOG.error("%s could not be created." % constants.VOLATILE_FIRST_BOOT_FLAG)
os.remove(FIRST_BOOT_FLAG)
LOG.info("Removed %s" % FIRST_BOOT_FLAG)
except exception.SysinvException:

1
sysinv/sysinv/sysinv/sysinv/common/constants.py
View File

@ -2120,6 +2120,7 @@ DEFAULT_DNS_SERVICE_DOMAIN = 'cluster.local'
# First boot
FIRST_BOOT_FLAG = os.path.join(tsc.PLATFORM_CONF_PATH, ".first_boot")
VOLATILE_FIRST_BOOT_FLAG = os.path.join(tsc.VOLATILE_PATH, ".first_boot")
# Ansible bootstrap
ANSIBLE_BOOTSTRAP_FLAG = os.path.join(tsc.VOLATILE_PATH, ".ansible_bootstrap")