opendev/system-config
Code Issues Proposed changes

Merge "Unbound: also override dhclient config on debian"

Browse Source
This commit is contained in:
Jenkins 2014-03-24 00:15:00 +00:00 committed by Gerrit Code Review
commit b8fee5eaf9
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/unbound/files/dhclient.conf.debian Normal file
View File

@ -0,0 +1,9 @@
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;
supersede domain-name-servers 127.0.0.1;

8
modules/unbound/manifests/init.pp
View File

@ -48,6 +48,14 @@ class unbound (
mode => '0444',
require => Service['unbound'],
}
# Tripleo uses dhcp
file { '/etc/dhcp/dhclient.conf':
source => 'puppet:///modules/unbound/dhclient.conf.debian',
owner => 'root',
group => 'root',
mode => '0444',
}
}
# Ubuntu uses resolvconf which will update resolv.conf to point to