diff options
| author | Micah Anderson <micah@leap.se> | 2015-07-23 11:46:55 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2015-07-23 11:46:55 -0400 |
| commit | 70b1c648b94e6c007b9241a4661f33881e74485f (patch) | |
| tree | 999e5dc1f386fc3894889c1cf263094cc748fd41 /puppet/modules/site_config/manifests/dhclient.pp | |
| parent | b429b30bda4dafc78cb02f6ece5d82f08e35de1f (diff) | |
| parent | 2761fa77394d5a2857812de840e49172d0e486fb (diff) | |
Merge branch 'develop'
Diffstat (limited to 'puppet/modules/site_config/manifests/dhclient.pp')
| -rw-r--r-- | puppet/modules/site_config/manifests/dhclient.pp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/dhclient.pp b/puppet/modules/site_config/manifests/dhclient.pp index dbe2ef1c..7755413b 100644 --- a/puppet/modules/site_config/manifests/dhclient.pp +++ b/puppet/modules/site_config/manifests/dhclient.pp @@ -22,11 +22,19 @@ class site_config::dhclient { require => File['/usr/local/sbin/reload_dhclient'], } + file { '/etc/dhcp/dhclient-enter-hooks.d': + ensure => directory, + mode => '0755', + owner => 'root', + group => 'root', + } + file { '/etc/dhcp/dhclient-enter-hooks.d/disable_resolvconf': content => 'make_resolv_conf() { : ; } ; set_hostname() { : ; }', mode => '0644', owner => 'root', group => 'root', + require => File['/etc/dhcp/dhclient-enter-hooks.d'], notify => Exec['reload_dhclient']; } } |