Merge pull request #686 from wyardley/issues_684

Install package via title, not name (#684)

manifests/init.pp

@@ -298,9 +298,11 @@
     case $facts['os']['family'] {
       'RedHat': {
         contain rabbitmq::repo::rhel
+        Class['rabbitmq::repo::rhel'] -> Class['rabbitmq::install']
       }
       'Debian': {
         contain rabbitmq::repo::apt
+        Class['rabbitmq::repo::apt'] -> Class['rabbitmq::install']
       }
       default: {
       }

manifests/install.pp

@@ -6,9 +6,8 @@
   $package_name     = $rabbitmq::package_name
   $rabbitmq_group   = $rabbitmq::rabbitmq_group
 
-  package { 'rabbitmq-server':
+  package { $package_name:
     ensure => $package_ensure,
-    name   => $package_name,
     notify => Class['rabbitmq::service'],
   }
 
@@ -18,7 +17,7 @@
       owner   => 'root',
       group   => $rabbitmq_group,
       mode    => '0775',
-      require => Package['rabbitmq-server'],
+      require => Package[$package_name],
     }
   }
 }

manifests/repo/apt.pp

@@ -16,7 +16,6 @@
   # ordering / ensure to get the last version of repository
   Class['rabbitmq::repo::apt']
   -> Class['apt::update']
-  -> Package<| title == 'rabbitmq-server' |>
 
   $osname = downcase($facts['os']['name'])
   apt::source { 'rabbitmq':

manifests/repo/rhel.pp

@@ -5,8 +5,6 @@
     String $key_source = $rabbitmq::package_gpg_key,
   ) {
 
-  Class['rabbitmq::repo::rhel'] -> Package<| title == 'rabbitmq-server' |>
-
   yumrepo { 'rabbitmq':
     ensure   => present,
     name     => 'rabbitmq_rabbitmq-server',

metadata.json

@@ -35,6 +35,12 @@
         "16.04"
       ]
     },
+    {
+      "operatingsystem": "SLES",
+      "operatingsystemrelease": [
+        "11"
+      ]
+    },
     {
       "operatingsystem": "FreeBSD"
     },

spec/classes/rabbitmq_spec.rb

@@ -36,7 +36,10 @@
       it { is_expected.to contain_class('rabbitmq::config') }
       it { is_expected.to contain_class('rabbitmq::service') }
 
-      it { is_expected.to contain_package('rabbitmq-server').with_ensure('installed').with_name(packagename) }
+      it { is_expected.to contain_package(packagename).with_ensure('installed').with_name(packagename) }
+      if facts[:os]['family'] == 'Suse'
+        it { is_expected.to contain_package('rabbitmq-server-plugins') }
+      end
 
       context 'with default params' do
         it { is_expected.not_to contain_class('rabbitmq::repo::apt') }