From e22fe0ed9b190e29e2a1e8f24e1f9c0d75c86673 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 12 Apr 2016 17:24:05 -0400
Subject: [PATCH] rabbitmq: use $::package_provider fact

Switch package_provider to use $::package_provider fact present in
puppetlabs-stdlib.

It will avoid any collision later.

Change-Id: I2df1bff1b911c22eed8a2f6b9c0ab38edda43156
---
 manifests/rabbitmq.pp | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/manifests/rabbitmq.pp b/manifests/rabbitmq.pp
index f17ec75dc..e828dcfe9 100644
--- a/manifests/rabbitmq.pp
+++ b/manifests/rabbitmq.pp
@@ -3,18 +3,6 @@ class openstack_integration::rabbitmq {
   include ::openstack_integration::params
   include ::openstack_integration::config
 
-  case $::osfamily {
-    'Debian': {
-      $package_provider = 'apt'
-    }
-    'RedHat': {
-      $package_provider = 'yum'
-    }
-    default: {
-      fail("Unsupported osfamily (${::osfamily})")
-    }
-  }
-
   if $::openstack_integration::config::ssl {
     file { '/etc/rabbitmq/ssl/private':
       ensure                  => directory,
@@ -29,8 +17,8 @@ class openstack_integration::rabbitmq {
       notify   => Service['rabbitmq-server'],
     }
     class { '::rabbitmq':
+      package_provider      => $::package_provider,
       delete_guest_user     => true,
-      package_provider      => $package_provider,
       ssl                   => true,
       ssl_only              => true,
       ssl_cacert            => $::openstack_integration::params::ca_bundle_cert_path,
@@ -40,8 +28,8 @@ class openstack_integration::rabbitmq {
     }
   } else {
     class { '::rabbitmq':
+      package_provider      => $::package_provider,
       delete_guest_user     => true,
-      package_provider      => $package_provider,
       environment_variables => $::openstack_integration::config::rabbit_env,
     }
   }