diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-28 22:55:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-28 22:55:48 +0000 |
| commit | d7a8b39585778e17d995df09079e7a1a0b8780a6 (patch) | |
| tree | facd7df5dcdceb3290b1f318abd6fe8927c8175c | |
| parent | 9b370b02006c7f3e0cf78f13ae0eb7b15f54613e (diff) | |
| parent | 38e67fcd310cd2a34c4213f6fc57f2f943e52f2a (diff) | |
Merge "Fix --noop being ignored for dhclient execution"
| -rw-r--r-- | os_net_config/impl_ifcfg.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/os_net_config/impl_ifcfg.py b/os_net_config/impl_ifcfg.py index f215378..f065f63 100644 --- a/os_net_config/impl_ifcfg.py +++ b/os_net_config/impl_ifcfg.py @@ -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) |