diff --git a/controllerconfig/controllerconfig/controllerconfig/utils.py b/controllerconfig/controllerconfig/controllerconfig/utils.py index f10eeaf593..d85eb4407a 100644 --- a/controllerconfig/controllerconfig/controllerconfig/utils.py +++ b/controllerconfig/controllerconfig/controllerconfig/utils.py @@ -238,7 +238,7 @@ def persist_config(): try: subprocess.check_call(["ln", "-s", constants.CONFIG_PERMDIR + - "/pxelinux.cfg", "/pxeboot/pxelinux.cfg"]) + "/pxelinux.cfg", "/var/pxeboot/pxelinux.cfg"]) except subprocess.CalledProcessError: LOG.error("Failed to create pxelinux.cfg symlink") raise Exception("Failed to persist config files") diff --git a/controllerconfig/controllerconfig/scripts/controller_config b/controllerconfig/controllerconfig/scripts/controller_config index a3330c7f10..8d007341ef 100755 --- a/controllerconfig/controllerconfig/scripts/controller_config +++ b/controllerconfig/controllerconfig/scripts/controller_config @@ -469,9 +469,9 @@ start() # Our PXE config files are located in the config directory. Create a # symbolic link if it is not already created. - if [ ! -L /pxeboot/pxelinux.cfg ] + if [ ! -L /var/pxeboot/pxelinux.cfg ] then - ln -sf $CONFIG_DIR/pxelinux.cfg /pxeboot/pxelinux.cfg + ln -sf $CONFIG_DIR/pxelinux.cfg /var/pxeboot/pxelinux.cfg fi # Upgrade related checks diff --git a/sysinv/sysinv/sysinv/etc/sysinv/delete_load.sh b/sysinv/sysinv/sysinv/etc/sysinv/delete_load.sh index 7239b0f283..3fbd06932e 100644 --- a/sysinv/sysinv/sysinv/etc/sysinv/delete_load.sh +++ b/sysinv/sysinv/sysinv/etc/sysinv/delete_load.sh @@ -12,8 +12,8 @@ VERSION=$1 FEED_DIR=/var/www/pages/feed/rel-$VERSION -rm -f /pxeboot/pxelinux.cfg.files/*-$VERSION -rm -rf /pxeboot/rel-$VERSION +rm -f /var/pxeboot/pxelinux.cfg.files/*-$VERSION +rm -rf /var/pxeboot/rel-$VERSION rm -f /usr/sbin/pxeboot-update-$VERSION.sh diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py index f023e42a9a..acaa732810 100644 --- a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py +++ b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py @@ -1185,19 +1185,19 @@ class ConductorManager(service.PeriodicService): # Remove an old file if it exists try: - os.remove("/pxeboot/pxelinux.cfg/01-" + dashed_mac) + os.remove("/var/pxeboot/pxelinux.cfg/01-" + dashed_mac) except OSError: pass try: - os.remove("/pxeboot/pxelinux.cfg/efi-01-" + dashed_mac) + os.remove("/var/pxeboot/pxelinux.cfg/efi-01-" + dashed_mac) except OSError: pass with open(os.devnull, "w") as fnull: try: subprocess.check_call( # pylint: disable=not-callable - [pxeboot_update, "-i", "/pxeboot/pxelinux.cfg.files/" + - pxe_config, "-o", "/pxeboot/pxelinux.cfg/01-" + + [pxeboot_update, "-i", "/var/pxeboot/pxelinux.cfg.files/" + + pxe_config, "-o", "/var/pxeboot/pxelinux.cfg/01-" + dashed_mac] + install_opts, stdout=fnull, stderr=fnull) @@ -1237,12 +1237,12 @@ class ConductorManager(service.PeriodicService): # Remove the old file if it exists try: - os.remove("/pxeboot/pxelinux.cfg/01-" + dashed_mac) + os.remove("/var/pxeboot/pxelinux.cfg/01-" + dashed_mac) except OSError: pass try: - os.remove("/pxeboot/pxelinux.cfg/efi-01-" + dashed_mac) + os.remove("/var/pxeboot/pxelinux.cfg/efi-01-" + dashed_mac) except OSError: pass