some cleanup

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/rabbitmq/manifests/config.pp b/modules/rabbitmq/manifests/config.pp
index 1bed1fee5cdd249b292f1cc994b7df81b826b375..724f53d720efd24ca184508e75063b20ef9b4fb2 100644 (file)
--- a/modules/rabbitmq/manifests/config.pp
+++ b/modules/rabbitmq/manifests/config.pp
@@ -3,7 +3,6 @@
 # Sets up the rabbitmq config file
 #
 class rabbitmq::config {
-       include rabbitmq::packages
        include concat::setup
 
        concat { '/etc/rabbitmq/rabbitmq.config':

diff --git a/modules/rabbitmq/manifests/packages.pp b/modules/rabbitmq/manifests/packages.pp
deleted file mode 100644 (file)
index 00bd0b5..0000000
--- a/modules/rabbitmq/manifests/packages.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# == Class: rabbitmq::packages
-#
-# Installs all the rabbitmq software
-#
-class rabbitmq::packages {
-               $ensure = installed
-
-       package { 'rabbitmq-server':
-               ensure  => $ensure,
-               require => User['rabbitmq']
-       }
-}

diff --git a/modules/rabbitmq/tests/config.pp b/modules/rabbitmq/tests/config.pp
deleted file mode 100644 (file)
index 36f5915..0000000
--- a/modules/rabbitmq/tests/config.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class rabbitmq::packages {
-       package { 'rabbitmq-server': }
-       service { 'rabbitmq-server': }
-}
-class concat::setup {}
-
-include rabbitmq::config

diff --git a/modules/rabbitmq/tests/init.pp b/modules/rabbitmq/tests/init.pp
deleted file mode 100644 (file)
index 01ac11f..0000000
--- a/modules/rabbitmq/tests/init.pp
+++ /dev/null
@@ -1,6 +0,0 @@
-class site::users::system::rabbitmq {}
-class rabbitmq::config {}
-class rabbitmq::packages {
-       package { 'rabbitmq-server': }
-}
-include rabbitmq

diff --git a/modules/rabbitmq/tests/packages.pp b/modules/rabbitmq/tests/packages.pp
deleted file mode 100644 (file)
index b1101b9..0000000
--- a/modules/rabbitmq/tests/packages.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class site::aptrepo::rabbitmq {}
-class site::yumrepo::rabbitmq {}
-class site::users::system::rabbitmq {
-       user { 'rabbitmq': }
-}
-include rabbitmq::packages
-