add support for setting search domains

closes GH-52
theforeman · Aug 4, 2015 · 1ad54b3 · 1ad54b3
1 parent d66778c
commit 1ad54b3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/manifests/pool.pp b/manifests/pool.pp
@@ -10,6 +10,7 @@
   $pxeserver       = undef,
   $domain_name     = undef,
   $static_routes   = undef,
+  $search_domains  = undef,
 ) {
 
   concat::fragment { "dhcp.conf+70_${name}.dhcp":

diff --git a/spec/defines/pool_spec.rb b/spec/defines/pool_spec.rb
@@ -52,6 +52,7 @@
       :pxeserver        => '10.0.0.2',
       :domain_name      => 'example.org',
       :static_routes    => [ { 'mask' => '24', 'network' => '10.0.1.0', 'gateway' => '10.0.0.2' } ],
+      :search_domains   => ['example.org', 'other.example.org'],
     } end
 
     it {
@@ -70,6 +71,7 @@
         "  option ntp-servers 10.0.0.2;",
         "  max-lease-time 300;",
         "  option domain-name-servers 10.0.0.2, 10.0.0.4;",
+        "  option domain-search \"example.org, other.example.org\";",
         "  next-server 10.0.0.2;",
         "}",
       ])

diff --git a/templates/dhcpd.pool.erb b/templates/dhcpd.pool.erb
@@ -48,6 +48,11 @@ subnet <%= @network %> netmask <%= @mask %> {
 <% elsif @nameservers -%>
   option domain-name-servers <%= @nameservers %>;
 <% end -%>
+<% if @search_domains and @search_domains.is_a? Array -%>
+  option domain-search "<%= @search_domains.sort.join(', ') %>";
+<% elsif @search_domains -%>
+  option domain-search "<%= @search_domains %>";
+<% end -%>
 <% if @pxeserver -%>
   next-server <%= @pxeserver %>;
 <% end -%>