From e8bc8eb33f979af2ffad558f4ae32010e896a1d0 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 16 Apr 2014 18:09:36 +0200 Subject: [PATCH] image: ensure notifier is really disable On RHEL, notifier is at "qpid" but we need to disable it for now. See https://github.com/enovance/puppet-openstack-cloud/issues/160 Signed-off-by: Emilien Macchi --- manifests/image.pp | 4 ++++ spec/classes/cloud_image_spec.rb | 1 + 2 files changed, 5 insertions(+) diff --git a/manifests/image.pp b/manifests/image.pp index d09cf749..e57d23ab 100644 --- a/manifests/image.pp +++ b/manifests/image.pp @@ -145,6 +145,10 @@ class cloud::image( # rabbit_userid => 'glance', # rabbit_host => $rabbit_host, # } + glance_api_config { + # TODO(EmilienM) Will be deprecated in Icehouse for notification_driver. + 'DEFAULT/notifier_strategy': value => 'noop'; + } class { 'glance::backend::rbd': rbd_store_user => $glance_rbd_user, diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb index f32f04a7..0c3b06ea 100644 --- a/spec/classes/cloud_image_spec.rb +++ b/spec/classes/cloud_image_spec.rb @@ -92,6 +92,7 @@ describe 'cloud::image' do # :rabbit_host => '10.0.0.1' # ) # end + it { should contain_glance_api_config('DEFAULT/notifier_strategy').with_value('noop') } it 'configure glance rbd backend' do should contain_class('glance::backend::rbd').with(