X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Fmanifests%2Frepo%2Frhel.pp;fp=3rdparty%2Fmodules%2Frabbitmq%2Fmanifests%2Frepo%2Frhel.pp;h=093f607d94dc6721f86b7daa11a86245af2838f5;hb=921e69100a563cf143f56a3905d8362336d939ff;hp=2849099456bf0e4c50e9dc3f51eccd1b4820e961;hpb=b54f52d2899c5785923c804fdfbba0782c147da4;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/rabbitmq/manifests/repo/rhel.pp b/3rdparty/modules/rabbitmq/manifests/repo/rhel.pp
index 284909945..093f607d9 100644
--- a/3rdparty/modules/rabbitmq/manifests/repo/rhel.pp
+++ b/3rdparty/modules/rabbitmq/manifests/repo/rhel.pp
@@ -1,16 +1,23 @@
 # Class: rabbitmq::repo::rhel
-# Imports the gpg key if it doesn't already exist.
-class rabbitmq::repo::rhel {
+# Makes sure that the Packagecloud repo is installed
+class rabbitmq::repo::rhel(
+    $location          = "https://packagecloud.io/rabbitmq/rabbitmq-server/el/${facts['os'][release][major]}/\$basearch",
+    String $key_source = $rabbitmq::package_gpg_key,
+  ) {
 
-  if $rabbitmq::repos_ensure {
-
-    $package_gpg_key = $rabbitmq::package_gpg_key
-
-    Class['rabbitmq::repo::rhel'] -> Package<| title == 'rabbitmq-server' |>
+  yumrepo { 'rabbitmq':
+    ensure   => present,
+    name     => 'rabbitmq_rabbitmq-server',
+    baseurl  => $location,
+    gpgkey   => $key_source,
+    enabled  => 1,
+    gpgcheck => 1,
+  }
 
-    exec { "rpm --import ${package_gpg_key}":
-      path   => ['/bin','/usr/bin','/sbin','/usr/sbin'],
-      unless => 'rpm -q gpg-pubkey-056e8e56-468e43f2 2>/dev/null',
-    }
+  # This may still be needed to prevent warnings
+  # packagecloud key is gpg-pubkey-d59097ab-52d46e88
+  exec { "rpm --import ${key_source}":
+    path   => ['/bin','/usr/bin','/sbin','/usr/sbin'],
+    unless => 'rpm -q gpg-pubkey-6026dfca-573adfde 2>/dev/null',
   }
 }