From cb61ea3efbb9611cf0f6badf74db38fcb65c4905 Mon Sep 17 00:00:00 2001
From: olevole <olevole@olevole.ru>
Date: Sat, 22 Apr 2017 14:01:53 +0300
Subject: [PATCH 1/2] add FreeBSD support

---
 manifests/params.pp           | 11 +++++++++++
 spec/classes/rabbitmq_spec.rb | 11 +++++++++++
 spec/spec_helper_local.rb     | 13 +++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index 106b0823f..e3688b83a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -29,6 +29,17 @@
       $rabbitmq_group   = '_rabbitmq'
       $rabbitmq_home    = '/var/rabbitmq'
     }
+    'FreeBSD': {
+      $package_ensure   = 'installed'
+      $package_name     = 'rabbitmq'
+      $service_name     = 'rabbitmq'
+      $package_provider = 'pkgng'
+      $version          = '3.4.2'
+      $rabbitmq_user    = 'rabbitmq'
+      $rabbitmq_group   = 'rabbitmq'
+      $rabbitmq_home    = '/var/db/rabbitmq'
+      $plugin_dir       = '/usr/local/lib/rabbitmq/plugins'
+    }
     'RedHat': {
       $package_ensure   = 'installed'
       $package_name     = 'rabbitmq-server'
diff --git a/spec/classes/rabbitmq_spec.rb b/spec/classes/rabbitmq_spec.rb
index 65673c2ed..17ef57dd8 100644
--- a/spec/classes/rabbitmq_spec.rb
+++ b/spec/classes/rabbitmq_spec.rb
@@ -1382,6 +1382,17 @@
     end
   end
 
+  context "on FreeBSD" do
+    with_freebsd_facts
+    it 'installs the rabbitmq package' do
+      should contain_package('rabbitmq-server').with(
+        'ensure'   => 'installed',
+        'name'     => 'rabbitmq',
+        'provider' => 'freebsd'
+      )
+    end
+  end
+
   describe 'repo management on Debian' do
     with_debian_facts
 
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 90061b7c5..96e311947 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -33,6 +33,19 @@ def with_openbsd_facts
   end
 end
 
+def with_freebsd_facts
+  # operatingsystemmajrelease is too broad
+  # operatingsystemrelease may contain X.X-current
+  # or other prefixes
+  let :facts do
+    super().merge({
+      :kernelversion             => '12',
+      :osfamily                  => 'FreeBSD',
+      :staging_http_get          => '',
+    })
+  end
+end
+
 def with_redhat_facts
   let :facts do
     super().merge(operatingsystemmajrelease: '7',

From 69d6ab15e88a462739e886be7ea4de1f9f102a5e Mon Sep 17 00:00:00 2001
From: William Yardley <wby@axs.com>
Date: Thu, 24 Aug 2017 17:16:16 -0700
Subject: [PATCH 2/2] Fix tests and add metadata (replaces #542)

---
 manifests/params.pp           |  3 ---
 metadata.json                 |  6 ++++++
 spec/classes/rabbitmq_spec.rb |  3 +--
 spec/spec_helper_local.rb     | 10 +++++-----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index e3688b83a..1b91d3d29 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -33,12 +33,9 @@
       $package_ensure   = 'installed'
       $package_name     = 'rabbitmq'
       $service_name     = 'rabbitmq'
-      $package_provider = 'pkgng'
-      $version          = '3.4.2'
       $rabbitmq_user    = 'rabbitmq'
       $rabbitmq_group   = 'rabbitmq'
       $rabbitmq_home    = '/var/db/rabbitmq'
-      $plugin_dir       = '/usr/local/lib/rabbitmq/plugins'
     }
     'RedHat': {
       $package_ensure   = 'installed'
diff --git a/metadata.json b/metadata.json
index 4c6a46640..e437cc2a1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -36,6 +36,12 @@
         "12.04",
         "14.04"
       ]
+    },
+    {
+      "operatingsystem": "FreeBSD"
+    },
+    {
+      "operatingsystem": "OpenBSD"
     }
   ],
   "requirements": [
diff --git a/spec/classes/rabbitmq_spec.rb b/spec/classes/rabbitmq_spec.rb
index 17ef57dd8..e7d650741 100644
--- a/spec/classes/rabbitmq_spec.rb
+++ b/spec/classes/rabbitmq_spec.rb
@@ -1385,10 +1385,9 @@
   context "on FreeBSD" do
     with_freebsd_facts
     it 'installs the rabbitmq package' do
-      should contain_package('rabbitmq-server').with(
+      is_expected.to contain_package('rabbitmq-server').with(
         'ensure'   => 'installed',
         'name'     => 'rabbitmq',
-        'provider' => 'freebsd'
       )
     end
   end
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index 96e311947..4dc5b21dc 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -38,11 +38,11 @@ def with_freebsd_facts
   # operatingsystemrelease may contain X.X-current
   # or other prefixes
   let :facts do
-    super().merge({
-      :kernelversion             => '12',
-      :osfamily                  => 'FreeBSD',
-      :staging_http_get          => '',
-    })
+    super().merge(
+      kernelversion: '12',
+      osfamily: 'FreeBSD',
+      staging_http_get: ''
+    )
   end
 end