Fix --noop being ignored for dhclient execution
The stop_dhclient_execution() method calls netconfig.execute directly from the object, instead of from the instance of the object. This has the effect that when execute is called, noop is always set false, even if os-net-config was called with --noop. This results in a failure or network outage. This change checks the value of self.noop from within the provider.apply() method before calling the stop_dhclient_execution method. Change-Id: Ie2cc4519d7028dceb3a14bd7711839834db0ebdf Closes-bug: 1699590
This commit is contained in:
parent
187c1e66d4
commit
38e67fcd31
|
@ -1019,7 +1019,10 @@ class IfcfgNetConfig(os_net_config.NetConfig):
|
|||
|
||||
# If dhclient is running and dhcp not set, stop dhclient
|
||||
for interface in stop_dhclient_interfaces:
|
||||
stop_dhclient_process(interface)
|
||||
logger.debug("Calling stop_dhclient_interfaces() for %s" %
|
||||
interface)
|
||||
if not self.noop:
|
||||
stop_dhclient_process(interface)
|
||||
|
||||
for interface in restart_interfaces:
|
||||
self.ifup(interface)
|
||||
|
|
Loading…
Reference in New Issue