Merge pull request #144 from xaque208/fix-selection-pattern

Fix jobs' $selection_pattern
voxpupuli · Sep 8, 2019 · 89d6111 · 89d6111
2 parents 0057ebf + c95ec0f
commit 89d6111
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 47 deletions.
diff --git a/lib/puppet/parser/functions/address_family.rb b/lib/puppet/parser/functions/address_family.rb
diff --git a/manifests/client.pp b/manifests/client.pp
@@ -27,7 +27,7 @@
   Optional[String]        $default_pool_inc,
   Optional[String]        $default_pool_diff,
   Integer                 $port                = 9102,
-  Stdlib::Ip::Address     $listen_address      = $facts['ipaddress'],
+  Optional[String]        $listen_address      = $facts['ipaddress'],
   String                  $password            = 'secret',
   Integer                 $max_concurrent_jobs = 2,
   String                  $director_name       = $bacula::director_name,

diff --git a/manifests/director.pp b/manifests/director.pp
@@ -47,7 +47,7 @@
   String                        $group               = $bacula::bacula_group,
   String                        $homedir             = $bacula::homedir,
   Optional[String]              $job_tag             = $bacula::job_tag,
-  Stdlib::Ip::Address           $listen_address      = $facts['ipaddress'],
+  Optional[String]              $listen_address      = $facts['ipaddress'],
   Integer                       $max_concurrent_jobs = 20,
   Boolean                       $manage_defaults     = true,
   String                        $password            = 'secret',

diff --git a/manifests/storage.pp b/manifests/storage.pp
@@ -31,7 +31,7 @@
   String              $director_name  = $bacula::director_name,
   String              $group          = $bacula::bacula_group,
   String              $homedir        = $bacula::homedir,
-  Stdlib::Ip::Address $listen_address = $facts['ipaddress'],
+  Optional[String]    $listen_address = $facts['ipaddress'],
   Integer             $maxconcurjobs  = 5,
   String              $media_type     = 'File',
   String              $password       = 'secret',

diff --git a/spec/functions/address_family_spec.rb b/spec/functions/address_family_spec.rb
diff --git a/templates/_listen.epp b/templates/_listen.epp
@@ -1,17 +1,15 @@
 <%
   |
-    Stdlib::Ip::Address $listen_address,
+    String              $listen_address,
     Optional[Integer]   $port,
   |
 -%>
-<% $family = address_family($listen_address)
-   if $family == 'INET' { -%>
-        ipv4 = {
+        <%= $listen_address ? {
+	      Stdlib::IP::Address::V4::Nosubnet => 'ipv4',
+	      Stdlib::IP::Address::V6::Nosubnet => 'ipv6',
+              default                           => 'ip',
+            } %> = {
             addr = <%= $listen_address %>;
-<% } elsif $family == 'INET6' { -%>
-        ipv6 = {
-            addr = <%= $listen_address %>;
-<% } -%>
 <% if $port { -%>
             port = <%= $port %>;
 <% } -%>

diff --git a/templates/job.conf.epp b/templates/job.conf.epp
@@ -56,7 +56,7 @@ Job {
     Selection Type = <%= $selection_type %>
   <%- } -%>
   <%- if $selection_pattern { -%>
-    Selection Type = <%= $selection_pattern %>
+    Selection Pattern = <%= $selection_pattern %>
   <%- } -%>
 <% } -%>