From 9cc80d5fed41727e9e0ed190fc58ed35a5a8c00d Mon Sep 17 00:00:00 2001 From: Michael Krotscheck Date: Tue, 9 Dec 2014 14:20:51 -0800 Subject: [PATCH] Rabbit repository management If we are running on anything before trusty, we need to manually manage the repository because the available version of rabbitmq is not recent enough for our module. For trusty and later, the available version is too recent for us to use, so we have to turn off repo management. This is volatile, and needs a more permanent solution. Change-Id: I0db87d6c5cbecee8575d91e6f88ef43a947967ff --- manifests/params.pp | 2 ++ manifests/rabbit.pp | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 12fd0c8..37c5bc2 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -27,8 +27,10 @@ class storyboard::params () { 'Debian': { if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 { $apache_version = '2.4' + $manage_rabbit_repo = false } else { $apache_version = '2.2' + $manage_rabbit_repo = true } } default: { diff --git a/manifests/rabbit.pp b/manifests/rabbit.pp index b4f0d7a..8167932 100644 --- a/manifests/rabbit.pp +++ b/manifests/rabbit.pp @@ -23,9 +23,12 @@ class storyboard::rabbit ( $rabbitmq_user_password ) { + require storyboard::params + class { 'rabbitmq': service_manage => true, - delete_guest_user => true + delete_guest_user => true, + manage_repos => $storyboard::params::manage_rabbit_repo, } rabbitmq_user { $rabbitmq_user: