From e5680ab0d422af8b05c4ecc965a0c7ee3b7fdfb6 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 12 Feb 2014 14:15:52 +0100 Subject: [PATCH] glance: disable rabbit notifications Close bug #160 Signed-off-by: Emilien Macchi --- manifests/image.pp | 13 ++++++++----- spec/classes/cloud_image_spec.rb | 17 ++++++++++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/manifests/image.pp b/manifests/image.pp index 01a1cb9e..a044a29b 100644 --- a/manifests/image.pp +++ b/manifests/image.pp @@ -121,11 +121,14 @@ class cloud::image( log_facility => $log_facility, } - class { 'glance::notify::rabbitmq': - rabbit_password => $rabbit_password, - rabbit_userid => 'glance', - rabbit_host => $rabbit_host, - } + # TODO(EmilienM) Disabled for now + # Follow-up: https://github.com/enovance/puppet-cloud/issues/160 + # + # class { 'glance::notify::rabbitmq': + # rabbit_password => $rabbit_password, + # rabbit_userid => 'glance', + # rabbit_host => $rabbit_host, + # } class { 'glance::backend::rbd': rbd_store_user => $rbd_store_user, diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb index dff8c3cf..0bd4b5f8 100644 --- a/spec/classes/cloud_image_spec.rb +++ b/spec/classes/cloud_image_spec.rb @@ -76,13 +76,16 @@ describe 'cloud::image' do ) end - it 'configure glance notifications with rabbitmq backend' do - should contain_class('glance::notify::rabbitmq').with( - :rabbit_password => 'secrete', - :rabbit_userid => 'glance', - :rabbit_host => '10.0.0.1' - ) - end + # TODO(EmilienM) Disabled for now + # Follow-up https://github.com/enovance/puppet-cloud/issues/160 + # + # it 'configure glance notifications with rabbitmq backend' do + # should contain_class('glance::notify::rabbitmq').with( + # :rabbit_password => 'secrete', + # :rabbit_userid => 'glance', + # :rabbit_host => '10.0.0.1' + # ) + # end it 'configure glance rbd backend' do should contain_class('glance::backend::rbd').with(