Changing behavior of dhclient supersede_domain param

diff --git a/manifests/subsystems/dhclient.pp b/manifests/subsystems/dhclient.pp
index b901d2b1bf1e9cb6f6294ef0f4c2b9b13fc4b4eb..13e636e15a9ffbc23d81b66d47e8d797ff248c8b 100644 (file)
--- a/manifests/subsystems/dhclient.pp
+++ b/manifests/subsystems/dhclient.pp
@@ -1,6 +1,6 @@
 class dhclient(
   $ensure           = hiera('nodo::dhclient::manage',           'present'),
-  $supersede_domain = hiera('nodo::dhclient::supersede_domain', '')
+  $supersede_domain = hiera('nodo::dhclient::supersede_domain', $::domain)
 ) {
   package { 'isc-dhcp-client':
     ensure => $ensure,

diff --git a/templates/dhcp/dhclient.conf.erb b/templates/dhcp/dhclient.conf.erb
index 134bf9aef3613d8ff553460505f8bdac4d824ad7..52b704c84acf513eeb61ac89e7ba1914a71d0f60 100644 (file)
--- a/templates/dhcp/dhclient.conf.erb
+++ b/templates/dhcp/dhclient.conf.erb
@@ -20,8 +20,8 @@ option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
 
 <%- if supersede_domain != '' then -%>
 # Force a domain name, otherwise facter and other configurations might break.
-supersede domain-name "<%= domain %>";
-supersede domain-search "<%= domain %>";
+supersede domain-name "<%= supersede_domain %>";
+supersede domain-search "<%= supersede_domain %>";
 <%- end -%>
 
 request subnet-mask, broadcast-address, time-offset, routers,