Revert "Update 3rdparty rabbitmq module"

[mirror/dsa-puppet.git] / 3rdparty / modules / rabbitmq / manifests / repo / rhel.pp

diff --git a/3rdparty/modules/rabbitmq/manifests/repo/rhel.pp b/3rdparty/modules/rabbitmq/manifests/repo/rhel.pp
index 093f607..2849099 100644 (file)
--- a/3rdparty/modules/rabbitmq/manifests/repo/rhel.pp
+++ b/3rdparty/modules/rabbitmq/manifests/repo/rhel.pp
@@ -1,23 +1,16 @@
 # 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,
-  ) {
+# Imports the gpg key if it doesn't already exist.
+class rabbitmq::repo::rhel {
 
-  yumrepo { 'rabbitmq':
-    ensure   => present,
-    name     => 'rabbitmq_rabbitmq-server',
-    baseurl  => $location,
-    gpgkey   => $key_source,
-    enabled  => 1,
-    gpgcheck => 1,
-  }
+  if $rabbitmq::repos_ensure {
+
+    $package_gpg_key = $rabbitmq::package_gpg_key
+
+    Class['rabbitmq::repo::rhel'] -> Package<| title == 'rabbitmq-server' |>
 
-  # 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',
+    exec { "rpm --import ${package_gpg_key}":
+      path   => ['/bin','/usr/bin','/sbin','/usr/sbin'],
+      unless => 'rpm -q gpg-pubkey-056e8e56-468e43f2 2>/dev/null',
+    }
   }
 }