Allow overriding the domain name per pool

ekohl · ekohl · commit 17155271d32e · 2015-02-04T13:09:40.000+01:00
Closes GH-23
diff --git a/manifests/pool.pp b/manifests/pool.pp
@@ -7,6 +7,7 @@
   $parameters  = '',
   $nameservers = undef,
   $pxeserver   = undef,
+  $domain_name = '',
 ) {
 
   concat_fragment { "dhcp.conf+70_${name}.dhcp":
diff --git a/spec/defines/pool_spec.rb b/spec/defines/pool_spec.rb
@@ -48,6 +48,7 @@
       :gateway     => '10.0.0.1',
       :nameservers => ['10.0.0.2', '10.0.0.4'],
       :pxeserver   => '10.0.0.2',
+      :domain_name => 'example.org',
     } end
 
     it {
@@ -58,6 +59,7 @@
           "  {",
           "    range 10.0.0.10 - 10.0.0.50;",
           "  }",
+          "  option domain-name example.org;",
           "  option subnet-mask 255.255.255.0;",
           "  option routers 10.0.0.1;",
           "  option domain-name-servers 10.0.0.2, 10.0.0.4;",
diff --git a/templates/dhcpd.pool.erb b/templates/dhcpd.pool.erb
@@ -9,6 +9,9 @@ subnet <%= @network %> netmask <%= @mask %> {
   }
 <% end -%>
 
+<% if @domain_name and !@domain_name.empty? -%>
+  option domain-name <%= @domain_name %>;
+<% end -%>
   option subnet-mask <%= @mask %>;
 <% if @gateway and !@gateway.empty? -%>
   option routers <%= @gateway %>;

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@ subnet <%= @network %> netmask <%= @mask %> {`
`9`	`9`	`}`
`10`	`10`	`<% end -%>`
`11`	`11`
	`12`	`+<% if @domain_name and !@domain_name.empty? -%>`
	`13`	`+ option domain-name <%= @domain_name %>;`
	`14`	`+<% end -%>`
`12`	`15`	`option subnet-mask <%= @mask %>;`
`13`	`16`	`<% if @gateway and !@gateway.empty? -%>`
`14`	`17`	`option routers <%= @gateway %>;`