Merge branch 'develop'

CHANGELOG

@@ -1,3 +1,8 @@
+2017-02-15  Andrea Manzi  <andrea.manzi@cern.ch>
+    * use puppet_vardir facter to relolve the plugin folder ( needed to support masterless deployments)
+    * change SELinux label on shift.conf
+    * remove puppet 4 warnings
+    * add dependency to service when enabling the srm/dpm/dpns 
 2016-12-15  Andrea Manzi  <andrea.manzi@cern.ch>
     * fix for shift creation without puppet master
 2016-12-12  Andrea Manzi  <andrea.manzi@cern.ch>

manifests/base/config.pp

@@ -64,10 +64,10 @@
       source  => '/etc/grid-security/hostkey.pem',
       require => User[$user];
 
-    [ "${settings::libdir}/augeas/", "${settings::libdir}/augeas/lenses/" ]:
+    [ "$puppet_vardir/lib", "$puppet_vardir/lib/augeas/", "$puppet_vardir/lib/augeas/lenses/" ]:
       ensure => directory;
-
-    "${settings::libdir}/augeas/lenses/shift.aug":
+    
+    "$puppet_vardir/lib/augeas/lenses/shift.aug":
        ensure  => present,
        owner   => root,
        group   => root,

manifests/ns/client.pp

@@ -1,4 +1,4 @@
-class lcgdm::ns::client ($flavor = undef, $dpmhost = $lcgdm::dpm::config::host) {
+class lcgdm::ns::client ($flavor = undef, $dpmhost = undef) {
   case $flavor {
     cns     : { $clientpkg = 'cns' }
     dpns    : { $clientpkg = 'dpm' }

manifests/ns/service.pp

@@ -14,16 +14,31 @@
 		"/etc/grid-security/$lcgdm::base::config::user/$lcgdm::base::config::certkey"],
   }
 
+
  #centOS7 changes
  if $::operatingsystemmajrelease and ($::operatingsystemmajrelease + 0) >= 7 {
-   file{'/etc/systemd/system/multi-user.target.wants/dpnsdaemon.service':
-     ensure => 'link',
-     target => '/usr/share/dpm-mysql/dpnsdaemon.service',
-   } ->
-   file{'/etc/systemd/system/dpnsdaemon.service':
-     ensure => link,
-     target => '/usr/share/dpm-mysql/dpnsdaemon.service',
-   } 
-    -> Service["${lcgdm::ns::config::daemon}"]
+   case $lcgdm::ns::config::daemon {
+    dpnsdaemon : {
+      file{'/etc/systemd/system/multi-user.target.wants/dpnsdaemon.service':
+        ensure => 'link',
+        target => '/usr/share/dpm-mysql/dpnsdaemon.service',
+      } ->
+      file{'/etc/systemd/system/dpnsdaemon.service':
+        ensure => link,
+        target => '/usr/share/dpm-mysql/dpnsdaemon.service',
+      } -> Service['dpnsdaemon']
+    }
+    lfcdaemon : {
+      file{'/etc/systemd/system/multi-user.target.wants/lfcdaemon.service':
+        ensure => 'link',
+        target => '/usr/share/lfc-mysql/lfcdaemon.service',
+      } ->
+      file{'/etc/systemd/system/lfcdaemon.service':
+        ensure => link,
+        target => '/usr/share/lfc-mysql/lfcdaemon.service',
+      } ->  Service['lfcdaemon']
+    }
+  }
  }
+
 }

manifests/shift/entry.pp

@@ -5,7 +5,7 @@
     context => '/files/etc/shift.conf',
     changes => ["rm name[.='$component'][type='$type']", "set name[last()+1] $component", "set name[last()]/type $type",],
     onlyif  => "match name[.='$component'][type='$type' and value='$value''] size == 0",
-    require => [ File["${settings::libdir}/augeas/lenses/shift.aug"],File['/etc/shift.conf']],
+    require => [ File["$puppet_vardir/lib/augeas/lenses/shift.aug"],File['/etc/shift.conf']],
   }
 
 }

manifests/shift/trust_value.pp

@@ -27,7 +27,7 @@
         value     => $host;
     }
   } else {
-    lcgdm::shift::value { "trust_$component-$host-$type":
+    lcgdm::shift::value { "trust_$component-$host":
       component => upcase($component),
       type      => 'TRUST',
       value     => $host,

manifests/shift/value.pp

@@ -10,7 +10,7 @@
       "set name[last()]/value[0] '$value'",
       ],
     onlyif  => "match name[.='$component'][type='$type' and value='$value'] size == 0",
-    require => [ File["${settings::libdir}/augeas/lenses/shift.aug"],File['/etc/shift.conf']],
+    require => [ File["$puppet_vardir/lib/augeas/lenses/shift.aug"],File['/etc/shift.conf']],
   }
 
 }

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.6"
+  "version": "0.3.7"
 }