diff options
author | Micah Anderson <micah@leap.se> | 2015-01-06 12:30:00 -0500 |
---|---|---|
committer | Micah Anderson <micah@leap.se> | 2015-01-06 12:30:00 -0500 |
commit | 3d2c6f315e99ad4fb9ceac9f392b7eab27f924aa (patch) | |
tree | d725470402edfa0eca3ae5e5094dbc6b26d14b0a /puppet/modules/site_config/manifests/dhclient.pp | |
parent | bd098f1691307685958d4a07caba9812c025e163 (diff) | |
parent | d063e35d3e29b3cedc810b8e5ca1855c841d8f9e (diff) |
Merge remote-tracking branch 'cz8s/check_dhcp' into develop (#6610)
Diffstat (limited to 'puppet/modules/site_config/manifests/dhclient.pp')
-rw-r--r-- | puppet/modules/site_config/manifests/dhclient.pp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/modules/site_config/manifests/dhclient.pp b/puppet/modules/site_config/manifests/dhclient.pp index 7ac0caf3..dbe2ef1c 100644 --- a/puppet/modules/site_config/manifests/dhclient.pp +++ b/puppet/modules/site_config/manifests/dhclient.pp @@ -17,7 +17,9 @@ class site_config::dhclient { exec { 'reload_dhclient': refreshonly => true, - command => '/usr/local/sbin/reload_dhclient'; + command => '/usr/local/sbin/reload_dhclient', + before => Class['site_config::resolvconf'], + require => File['/usr/local/sbin/reload_dhclient'], } file { '/etc/dhcp/dhclient-enter-hooks.d/disable_resolvconf': |