X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Fmanifests%2Fserver.pp;fp=3rdparty%2Fmodules%2Frabbitmq%2Fmanifests%2Fserver.pp;h=e7f17083a7832e2ea779245c289644a664c27794;hb=921e69100a563cf143f56a3905d8362336d939ff;hp=05de184fc3a7dea13bea67fd1779674368a84246;hpb=b54f52d2899c5785923c804fdfbba0782c147da4;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/rabbitmq/manifests/server.pp b/3rdparty/modules/rabbitmq/manifests/server.pp
index 05de184fc..e7f17083a 100644
--- 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*] - version of rabbitmq-server to install
+#  [*version*] - deprecated -- does nothing
 #  [*package_name*] - name of rabbitmq package
 #  [*service_name*] - name of rabbitmq service
 #  [*service_ensure*] - desired ensure state for service
@@ -36,7 +36,6 @@ 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,
@@ -52,19 +51,10 @@ 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,
@@ -79,4 +69,5 @@ class rabbitmq::server(
     erlang_cookie            => $erlang_cookie,
     wipe_db_on_cookie_change => $wipe_db_on_cookie_change,
   }
+  contain rabbitmq
 }