fix merge

CHANGELOG

@@ -1,3 +1,5 @@
+2016-07-08  Andrea Manzi  <andrea.manzi@cern.ch>
+    * added DPNS/DPM restart on certificate change
 2016-05-31  Andrea Manzi  <andrea.manzi@cern.ch>
     * added a cron job for dpns-arguspoll
     * added override for dpm db names

manifests/dpm/service.pp

@@ -1,13 +1,17 @@
 class lcgdm::dpm::service () inherits lcgdm::dpm::params {
   Class[lcgdm::dpm::install] -> Class[lcgdm::dpm::service]
 
+  Class[lcgdm::base::config] ->  Class[lcgdm::dpm::service]
+
   service { 'dpm':
     ensure     => running,
     enable     => true,
     hasrestart => true,
     hasstatus  => true,
     name       => 'dpm',
-    subscribe  => File["${configfile}"],
+    subscribe  => File["${configfile}",
+	          "/etc/grid-security/$lcgdm::base::config::user/$lcgdm::base::config::cert",
+                  "/etc/grid-security/$lcgdm::base::config::user/$lcgdm::base::config::certkey"],
   }
 
    #centOS7 changes

manifests/ns/service.pp

@@ -1,13 +1,17 @@
 class lcgdm::ns::service ($dbmanage = $lcgdm::ns::params::dbmanage, $dbflavor = $lcgdm::ns::params::dbflavor) inherits lcgdm::ns::params {
   Class[lcgdm::ns::install] -> Class[lcgdm::ns::service]
 
+  Class[lcgdm::base::config] ->  Class[lcgdm::ns::service]
+
   service { "${lcgdm::ns::config::daemon}":
     ensure     => running,
     enable     => true,
     hasrestart => true,
     hasstatus  => true,
     name       => "${lcgdm::ns::config::daemon}",
-    subscribe  => File["${configfile}", "/etc/sysconfig/${lcgdm::ns::config::daemon}"],
+    subscribe  => File["${configfile}", "/etc/sysconfig/${lcgdm::ns::config::daemon}",
+		"/etc/grid-security/$lcgdm::base::config::user/$lcgdm::base::config::cert",
+		"/etc/grid-security/$lcgdm::base::config::user/$lcgdm::base::config::certkey"],
   }
 
  #centOS7 changes

manifests/rfio/service.pp

@@ -1,12 +1,17 @@
 class lcgdm::rfio::service () inherits lcgdm::rfio::params {
   Class[lcgdm::rfio::install] -> Class[lcgdm::rfio::service]
+
+  Class[lcgdm::base::config] ->  Class[lcgdm::rfio::service]
 
   service { 'rfiod':
     ensure     => running,
     enable     => true,
     hasrestart => true,
     hasstatus  => true,
     name       => 'rfiod',
-    subscribe  => File['/etc/sysconfig/rfiod'],
+    subscribe  => File['/etc/sysconfig/rfiod',
+                  "/etc/grid-security/$lcgdm::base::config::user/$lcgdm::base::config::cert",
+                  "/etc/grid-security/$lcgdm::base::config::user/$lcgdm::base::config::certkey"],
+
   }
 }

metadata.json

@@ -19,5 +19,5 @@
   "source": "https://github.com/cern-it-sdc-id/puppet-lcgdm",
   "summary": "Package for managing lcgdm components",
   "tags": [],
-  "version": "0.3.2"
+  "version": "0.3.3"
 }