Merge "[puppet4] Fix fuel::cobbler task"

deployment/puppet/cobbler/manifests/init.pp

@@ -76,12 +76,17 @@ class cobbler(
   class { '::cobbler::selinux': }
   class { '::cobbler::iptables': }
   class { '::cobbler::server':
-    domain_name  => $domain_name,
-    production   => $production,
-    dns_upstream => $dns_upstream,
-    dns_domain   => $dns_domain,
-    dns_search   => $dns_search,
-    dhcp_gateway => $dhcp_gateway,
+    domain_name    => $domain_name,
+    production     => $production,
+    dns_upstream   => $dns_upstream,
+    dns_domain     => $dns_domain,
+    dns_search     => $dns_search,
+    dhcp_gateway   => $dhcp_gateway,
+    dhcp_ipaddress => $dhcp_ipaddress,
+    name_server    => $name_server,
+    next_server    => $next_server,
+    server         => $server,
+    pxetimeout     => $pxetimeout,
   }
 
   cobbler_digest_user { $cobbler_user:

deployment/puppet/cobbler/manifests/server.pp

@@ -32,7 +32,12 @@ class cobbler::server (
   $dns_upstream   = ['8.8.8.8'],
   $dhcp_gateway   = unset,
   $dhcp_lease_max = '1800',
+  $dhcp_ipaddress = '127.0.0.1',
   $lease_time     = '120m',
+  $server         = $ipaddress,
+  $name_server    = $ipaddress,
+  $next_server    = $ipaddress,
+  $pxetimeout     = '0',
 ) {
   include ::cobbler::packages
 

deployment/puppet/cobbler/spec/classes/cobbler_spec.rb

@@ -50,6 +50,11 @@ describe 'cobbler' do
             :dns_search => params[:dns_search],
             :dhcp_gateway => params[:dhcp_gateway],
             :extra_admins_net => params[:extra_admins_nets],
+            :name_server => params[:name_server],
+            :next_server => params[:next_server],
+            :server => params[:server],
+            :pxetimeout => params[:pxetimeout],
+            :dhcp_ipaddress => params[:dhcp_ipaddress],
         )
       end