From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 31 Mar 2013 23:25:34 +0000 (-0300)
Subject: Parametrize dhclient class
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f0e9bb998b56fe42a7d25eacf43591d4b922cb89;p=puppet-nodo.git

Parametrize dhclient class
---

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,