aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-03-31 20:25:34 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-03-31 20:25:34 -0300
commitf0e9bb998b56fe42a7d25eacf43591d4b922cb89 (patch)
treee081f6af0f2c307f80f3ad4badfa40f812e373e3
parentf5e4f0d0e4465f739a854393e89298e1b9bbc262 (diff)
downloadpuppet-nodo-f0e9bb998b56fe42a7d25eacf43591d4b922cb89.tar.gz
puppet-nodo-f0e9bb998b56fe42a7d25eacf43591d4b922cb89.tar.bz2
Parametrize dhclient class
-rw-r--r--manifests/subsystems/dhclient.pp9
-rw-r--r--templates/dhcp/dhclient.conf.erb2
2 files changed, 8 insertions, 3 deletions
diff --git a/manifests/subsystems/dhclient.pp b/manifests/subsystems/dhclient.pp
index 7c4ebf4..b901d2b 100644
--- a/manifests/subsystems/dhclient.pp
+++ b/manifests/subsystems/dhclient.pp
@@ -1,10 +1,13 @@
-class dhclient {
+class dhclient(
+ $ensure = hiera('nodo::dhclient::manage', 'present'),
+ $supersede_domain = hiera('nodo::dhclient::supersede_domain', '')
+) {
package { 'isc-dhcp-client':
- ensure => present,
+ ensure => $ensure,
}
file { '/etc/dhcp/dhclient.conf':
- ensure => present,
+ ensure => $ensure,
owner => root,
group => root,
mode => 0644,
diff --git a/templates/dhcp/dhclient.conf.erb b/templates/dhcp/dhclient.conf.erb
index 39eeeb5..dfc465d 100644
--- a/templates/dhcp/dhclient.conf.erb
+++ b/templates/dhcp/dhclient.conf.erb
@@ -18,9 +18,11 @@ option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
#send dhcp-lease-time 3600;
#prepend domain-name-servers 127.0.0.1;
+<%- if $supersede_domain != '' then -%>
# Force a domain name, otherwise facter and other configurations might break.
supersede domain-name "<%= domain %>";
supersede domain-search "<%= domain %>";
+<%- end -%>
request subnet-mask, broadcast-address, time-offset, routers,
domain-name, domain-name-servers, domain-search, host-name,