From 8ca9d2f1e1bd42dd6e72bb3b22489734713bde4b Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 25 Aug 2013 20:15:53 +0100 Subject: [PATCH] some cleanup Signed-off-by: Stephen Gran --- modules/rabbitmq/manifests/config.pp | 1 - modules/rabbitmq/manifests/packages.pp | 12 ------------ modules/rabbitmq/tests/config.pp | 7 ------- modules/rabbitmq/tests/init.pp | 6 ------ modules/rabbitmq/tests/packages.pp | 7 ------- 5 files changed, 33 deletions(-) delete mode 100644 modules/rabbitmq/manifests/packages.pp delete mode 100644 modules/rabbitmq/tests/config.pp delete mode 100644 modules/rabbitmq/tests/init.pp delete mode 100644 modules/rabbitmq/tests/packages.pp diff --git a/modules/rabbitmq/manifests/config.pp b/modules/rabbitmq/manifests/config.pp index 1bed1fee..724f53d7 100644 --- 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 index 00bd0b5b..00000000 --- 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 index 36f5915a..00000000 --- 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 index 01ac11fd..00000000 --- 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 index b1101b99..00000000 --- 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 - -- 2.39.2