Merge pull request #250 from bmagistro/jira-bitbucket-pkg-conflict

switch to using ensure_packages to avoid conflicts
voxpupuli · Jun 16, 2018 · a40b36f · a40b36f
2 parents e4462f5 + 728fa18
commit a40b36f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/manifests/facts.pp b/manifests/facts.pp
@@ -49,9 +49,7 @@
   }
 
   if $facts['osfamily'] == 'RedHat' and $facts['puppetversion'] !~ /Puppet Enterprise/ {
-    package { $json_packages:
-      ensure => present,
-    }
+    ensure_packages ($json_packages, { ensure => present })
   }
 
   file { "/etc/${dir}facter/facts.d/jira_facts.rb":

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -9,7 +9,7 @@
   case $facts['osfamily'] {
     /RedHat/: {
       if versioncmp($facts['operatingsystemmajrelease'], '7') >= 0 {
-        $json_packages = 'rubygem-json'
+        $json_packages = [ 'rubygem-json' ]
         $service_file_location = '/usr/lib/systemd/system/jira.service'
         $service_file_template = 'jira/jira.service.erb'
         $service_lockfile = '/var/lock/subsys/jira'
@@ -29,7 +29,7 @@
       case $::operatingsystem {
         'Ubuntu': {
           if versioncmp($facts['operatingsystemmajrelease'], '15.04') >= 0 {
-            $json_packages = 'ruby-json'
+            $json_packages = [ 'ruby-json' ]
             $service_file_location = '/lib/systemd/system/jira.service'
             $service_file_template = 'jira/jira.service.erb'
             $service_lockfile = '/var/lock/subsys/jira'
@@ -44,7 +44,7 @@
         }
         default: {
           if versioncmp($facts['operatingsystemmajrelease'], '8') >= 0 {
-            $json_packages = 'ruby-json'
+            $json_packages = [ 'ruby-json' ]
             $service_file_location = '/lib/systemd/system/jira.service'
             $service_file_template = 'jira/jira.service.erb'
             $service_lockfile = '/var/lock/subsys/jira'