Fix service notifications (#35)

broadinstitute · Jul 24, 2018 · aa4fa4f · aa4fa4f
1 parent 8e78b79
commit aa4fa4f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Release 2.3.2 (July 24, 2018)
+
+### Summary
+* Fix service notifications to work with global definitions as well as per-node definitions
+
 ## Release 2.3.1 (June 18, 2018)
 
 ### Summary

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
       gettext-setup (~> 0.11)
       minitar
       semantic_puppet (~> 1.0)
-    puppetlabs_spec_helper (2.7.0)
+    puppetlabs_spec_helper (2.9.0)
       mocha (~> 1.0)
       puppet-lint (~> 2.0)
       puppet-syntax (~> 2.0)
@@ -71,7 +71,7 @@ GEM
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
-    rspec-puppet (2.6.11)
+    rspec-puppet (2.6.12)
       rspec
     rspec-puppet-utils (3.4.0)
       mocha
@@ -82,7 +82,7 @@ GEM
     rspec-support (3.7.1)
     rsync (1.0.9)
     semantic_puppet (1.0.2)
-    spdx-licenses (1.1.0)
+    spdx-licenses (1.2.0)
     text (1.3.1)
     thor (0.20.0)
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -175,7 +175,7 @@
   String $key_ext,
   String $key_mode,
   String $owner,
-  Optional[String] $service,
+  Optional[String] $service           = undef,
   Optional[String] $source_path       = undef,
   Optional[String] $ca_content        = undef,
   Optional[String] $ca_name           = undef,

diff --git a/manifests/site.pp b/manifests/site.pp
@@ -332,12 +332,23 @@
     }
   }
 
-  case $service {
-    undef: {
-      $service_notify = undef
+  if $service {
+    case $service {
+      undef: {
+        $service_notify = undef
+      }
+      default: {
+        $service_notify = Service[$service]
+      }
     }
-    default: {
-      $service_notify = Service[$service]
+  } else {
+    case $::certs::service {
+      undef: {
+        $service_notify = undef
+      }
+      default: {
+        $service_notify = Service[$service]
+      }
     }
   }
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "broadinstitute-certs",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "author": "Riccardo Calixte <rcalixte@broadinstitute.org>",
   "description": "Module for SSL certificate configuration",
   "summary": "Configures and manages SSL certificate deployments, restarting services as configured.",
@@ -56,7 +56,8 @@
       "operatingsystem": "SuSE",
       "operatingsystemrelease": [
         "11SP4",
-        "12SP3"
+        "12SP3",
+        "15"
       ]
     }
   ],