diff --git a/puppet-manifests/src/bin/apply_network_config.py b/puppet-manifests/src/bin/apply_network_config.py index fa28d5049..822e3bc21 100644 --- a/puppet-manifests/src/bin/apply_network_config.py +++ b/puppet-manifests/src/bin/apply_network_config.py @@ -814,6 +814,10 @@ def disable_pxeboot_interface(): for iface in ifaces.keys(): LOG.info(f"Turn off pxeboot install config for {iface}, will be turned on later") set_iface_down(iface) + if is_label(iface): + base_iface = get_base_iface(iface) + LOG.info(f"Turn off pxeboot for base interface {base_iface}") + set_iface_down(base_iface) LOG.info("Remove ifcfg-pxeboot, left from kickstart install phase") remove_iface_config_file("pxeboot") diff --git a/puppet-manifests/tests/test_apply_network_config.py b/puppet-manifests/tests/test_apply_network_config.py index 202a08c5c..0c7f81b8c 100644 --- a/puppet-manifests/tests/test_apply_network_config.py +++ b/puppet-manifests/tests/test_apply_network_config.py @@ -2191,9 +2191,11 @@ class GeneralTests(BaseTestCase): # pylint: disable=too-many-public-methods self.assertEqual([ ('info', 'Turn off pxeboot install config for enp0s8:2, will be turned on later'), ('info', 'Bringing enp0s8:2 down'), + ('info', 'Turn off pxeboot for base interface enp0s8'), + ('info', 'Bringing enp0s8 down'), ('info', 'Remove ifcfg-pxeboot, left from kickstart install phase'), ('info', 'Removing /etc/network/interfaces.d/ifcfg-pxeboot')], - self._log.get_history()[:4]) + self._log.get_history()[:6]) def test_execute_system_cmd(self): retcode, stdout = anc.execute_system_cmd('echo "test_execute_system_cmd"')