aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/subsystems/dhclient.pp2
-rw-r--r--templates/dhcp/dhclient.conf.erb4
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/subsystems/dhclient.pp b/manifests/subsystems/dhclient.pp
index b901d2b..13e636e 100644
--- 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 134bf9a..52b704c 100644
--- 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,