Merge branch 'develop'

cern-it-sdc-id · Sep 17, 2019 · 6925410 · 6925410
2 parents 816dbf9 + 24f5b35
commit 6925410
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2019-09-17  Petr Vokac  <[email protected]>
+    * fix warnings
 2019-02-11  Petr Vokac  <[email protected]>
     * add unset for shift.conf
 2018-01-18  Andrea Manzi  <[email protected]>

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This is the puppet-lcgdm module, it configures the DPM/LFC legacy components dev
 ASL 2.0
 
 ### Contact
-Andrea Manzi <andrea.manzi@cern.ch>
+DPM Devel <dpm-devel-cern@cern.ch>
 
 ## Support
-Tickets and issues at our [cern-it-sdc-id site](https://github.com/cern-it-sdc-id)
+Tickets and issues at our [Jira](https://its.cern.ch/jira/projects/LCGDM)
diff --git a/manifests/dpm/service.pp b/manifests/dpm/service.pp
@@ -15,7 +15,7 @@
   }
 
    #centOS7 changes
- if $::operatingsystemmajrelease and ($::operatingsystemmajrelease + 0) >= 7 {
+ if versioncmp($facts['os']['release']['major'], '7') >= 0 {
 
    file{'/etc/systemd/system/multi-user.target.wants/dpm.service':
      ensure => 'link',

diff --git a/manifests/ns/service.pp b/manifests/ns/service.pp
@@ -16,7 +16,7 @@
 
 
  #centOS7 changes
- if $::operatingsystemmajrelease and ($::operatingsystemmajrelease + 0) >= 7 {
+ if versioncmp($facts['os']['release']['major'], '7') >= 0 {
    case $lcgdm::ns::config::daemon {
     dpnsdaemon : {
       file{'/etc/systemd/system/multi-user.target.wants/dpnsdaemon.service':

diff --git a/metadata.json b/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.10"
+  "version": "0.3.11"
 }