Merge branch 'jeff/rabbitmq-2.4.1'

* jeff/rabbitmq-2.4.1:
  Add support for RabbitMQ 2.4.1

CHANGELOG

@@ -1,3 +1,6 @@
+* 2011-04-08 Jeff McCune <jeff@puppetlabs.com> 1.0.4
+- Update module for RabbitMQ 2.4.1 and rabbitmq-plugin-stomp package.
+
 2011-03-24 1.0.3
 - Initial release to the forge.  Reviewed by Cody.  Whitespace is good.
 

Modulefile

@@ -1,5 +1,5 @@
 name    'puppetlabs-rabbitmq'
-version '1.0.3'
+version '1.0.4'
 source 'git://github.com/puppetlabs/puppetlabs-rabbitmq.git'
 author 'puppetlabs'
 license 'Apache'
@@ -8,4 +8,4 @@ description 'This module manages RabbitMQ for use with MCollective.  Tested on E
 project_page 'http://github.com/puppetlabs/puppetlabs-rabbitmq'
 
 ## Add dependencies, if any:
-# dependency 'username/name', '>= 1.2.0'
+dependency 'puppetlabs/prosvc_repo', '>= 1.0.0'

manifests/init.pp

@@ -14,15 +14,15 @@
 class rabbitmq($config='UNSET') inherits rabbitmq::params {
 
   if $config == 'UNSET' {
-    $config_real = template("${module_name}/rabbitmq.conf")
+    $config_real = template("${module_name}/rabbitmq.config")
   } else {
     $config_real = $config
   }
 
   package { $packages:
     ensure => $pkg_ensure,
     notify => Class['rabbitmq::service'],
-    before => File['rabbitmq.conf'],
+    before => File['rabbitmq.config'],
   }
 
   file { '/etc/rabbitmq':
@@ -33,9 +33,9 @@
     require => Package[$packages],
   }
 
-  file { 'rabbitmq.conf':
+  file { 'rabbitmq.config':
     ensure  => file,
-    path    => '/etc/rabbitmq/rabbitmq.conf',
+    path    => '/etc/rabbitmq/rabbitmq.config',
     content => $config_real,
     owner   => '0',
     group   => '0',

manifests/params.pp

@@ -19,21 +19,28 @@
 #   class rabbitmq inherits rabbitmq::params { }
 #
 class rabbitmq::params(
-  $version = 'UNSET'
+  $version    = 'UNSET',
+  $stomp_port = '6163'
 ) {
 
   # This is the RabbitMQ Server Version
   if $version == 'UNSET' {
-    $version_real = '2.3.1'
+    $version_real = '2.4.1'
     $pkg_ensure   = 'present'
   } else {
     $version_real = $version
     $pkg_ensure   = $version
   }
 
+  if $stomp_port =~ /\d+/ {
+    $stomp_port_real = $stomp_port
+  } else {
+    fail("Stomp Port must be a number!  Got: $stomp_port")
+  }
+
   case $operatingsystem {
     centos, redhat, oel: {
-      $packages = 'rabbitmq-server'
+      $packages = [ 'rabbitmq-server', 'rabbitmq-plugin-stomp' ]
       $service  = 'rabbitmq-server'
       $plugin_dir = "/usr/lib/rabbitmq/lib/rabbitmq_server-${version_real}/plugins"
     }

manifests/plugin.pp

@@ -2,6 +2,10 @@
 #
 #   This defined resource type manages plugins for RabbitMQ
 #
+#    NOTE: It is reommended to use packages to manage plugins if at all
+#    possible.  There are packages for stomp and amqp available in the prosvc
+#    repository at http://yum.puppetlabs.com/prosvc/
+#
 # Parameters:
 #
 # Actions:
@@ -10,10 +14,7 @@
 #
 # Sample Usage:
 #
-define rabbitmq::plugin(
-  $ensure='UNSET',
-  $source='UNSET'
-) {
+define rabbitmq::plugin( $ensure='UNSET', $source='UNSET') {
 
   $plugin_dir = $::rabbitmq::params::plugin_dir
   $service    = $::rabbitmq::params::service

templates/rabbitmq.config

@@ -0,0 +1,7 @@
+% This file managed by Puppet <%= puppetversion %>
+% Template Path: <%= module_name %>/templates/rabbitmq.config
+
+% Configure the Stomp Plugin listening port
+[ {rabbit_stomp, [{tcp_listeners, [<%= stomp_port_real %>]} ]} ].
+
+% EOF