Revert "Update 3rdparty rabbitmq module"

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

diff --git a/3rdparty/modules/rabbitmq/manifests/server.pp b/3rdparty/modules/rabbitmq/manifests/server.pp
index e7f1708..05de184 100644 (file)
--- a/3rdparty/modules/rabbitmq/manifests/server.pp
+++ b/3rdparty/modules/rabbitmq/manifests/server.pp
@@ -5,7 +5,7 @@
 # Parameters:
 #  [*port*] - port where rabbitmq server is hosted
 #  [*delete_guest_user*] - rather or not to delete the default user
-#  [*version*] - deprecated -- does nothing
+#  [*version*] - version of rabbitmq-server to install
 #  [*package_name*] - name of rabbitmq package
 #  [*service_name*] - name of rabbitmq service
 #  [*service_ensure*] - desired ensure state for service
@@ -36,6 +36,7 @@ class rabbitmq::server(
   $port                     = $rabbitmq::params::port,
   $delete_guest_user        = $rabbitmq::params::delete_guest_user,
   $package_name             = $rabbitmq::params::package_name,
+  $version                  = $rabbitmq::params::version,
   $service_name             = $rabbitmq::params::service_name,
   $service_ensure           = $rabbitmq::params::service_ensure,
   $service_manage           = $rabbitmq::params::service_manage,
@@ -51,10 +52,19 @@ class rabbitmq::server(
   $wipe_db_on_cookie_change = $rabbitmq::params::wipe_db_on_cookie_change,
 ) inherits rabbitmq::params {
 
+  anchor {'before::rabbimq::class':
+    before => Class['rabbitmq'],
+  }
+
+  anchor {'after::rabbimq::class':
+    require => Class['rabbitmq'],
+  }
+
   class { 'rabbitmq':
     port                     => $port,
     delete_guest_user        => $delete_guest_user,
     package_name             => $package_name,
+    version                  => $version,
     service_name             => $service_name,
     service_ensure           => $service_ensure,
     service_manage           => $service_manage,
@@ -69,5 +79,4 @@ class rabbitmq::server(
     erlang_cookie            => $erlang_cookie,
     wipe_db_on_cookie_change => $wipe_db_on_cookie_change,
   }
-  contain rabbitmq
 }