Update dhclient.conf to be in sync across all OSes
After finding some puppet jobs were failing on CentOS it was found the DHCP server for osic and ovh were passing extra settings. As a results, we also noticed our dhclient.conf was not in sync around all of our images. So, this patch attemps to fix both issues. Change-Id: I2415f7e42a9d5931589192b7d78423941e02b076 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
6cf476e7c2
commit
dffe3580c1
|
@ -1,9 +1,7 @@
|
|||
option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
|
||||
send host-name "<hostname>";
|
||||
request subnet-mask, broadcast-address, time-offset, routers,
|
||||
domain-name, domain-name-servers, domain-search, host-name,
|
||||
netbios-name-servers, netbios-scope, interface-mtu,
|
||||
rfc3442-classless-static-routes, ntp-servers,
|
||||
dhcp6.domain-search, dhcp6.fqdn,
|
||||
dhcp6.name-servers, dhcp6.sntp-servers;
|
||||
request subnet-mask, broadcast-address, routers,
|
||||
interface-mtu, rfc3442-classless-static-routes;
|
||||
supersede domain-name-servers 127.0.0.1;
|
||||
supersede domain-search "";
|
||||
supersede domain-name "";
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
|
||||
send host-name "<hostname>";
|
||||
request subnet-mask, broadcast-address, routers,
|
||||
interface-mtu, rfc3442-classless-static-routes;
|
||||
supersede domain-name-servers 127.0.0.1;
|
||||
supersede domain-search "";
|
||||
supersede domain-name "";
|
|
@ -57,9 +57,11 @@ class unbound (
|
|||
ensure => present,
|
||||
}
|
||||
|
||||
# HPCloud uses dhclient; tell dhclient to use our nameserver instead.
|
||||
exec { '/usr/bin/printf "\nsupersede domain-name-servers 127.0.0.1;\n" >> /etc/dhcp/dhclient-eth0.conf':
|
||||
unless => '/bin/grep -q "supersede domain-name-servers" /etc/dhcp/dhclient-eth0.conf'
|
||||
file { '/etc/dhcp/dhclient-eth0.conf':
|
||||
source => 'puppet:///modules/unbound/dhclient.conf.redhat',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue