From 15e32b1e4ab513fbe980e84d6585be42385c0ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= Date: Tue, 3 Sep 2013 09:51:10 -0400 Subject: [PATCH] Add ability to configure control_exchange Add control_exchange parameter with default to 'openstack'. The control_exchange configuration defaults to 'openstack' in Cinder. Fixes: bug #1220272 Change-Id: Ic15e471a745568e5183ad9eedba92c213026309e --- manifests/init.pp | 2 ++ spec/classes/cinder_spec.rb | 3 +++ 2 files changed, 5 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 8ccc1e01..d4aaa895 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -9,6 +9,7 @@ class cinder ( $sql_connection, $sql_idle_timeout = '3600', $rpc_backend = 'cinder.openstack.common.rpc.impl_kombu', + $control_exchange = 'openstack', $rabbit_host = '127.0.0.1', $rabbit_port = 5672, $rabbit_hosts = false, @@ -75,6 +76,7 @@ class cinder ( 'DEFAULT/rabbit_password': value => $rabbit_password, secret => true; 'DEFAULT/rabbit_userid': value => $rabbit_userid; 'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host; + 'DEFAULT/control_exchange': value => $control_exchange; } if $rabbit_hosts { diff --git a/spec/classes/cinder_spec.rb b/spec/classes/cinder_spec.rb index 2fede94f..4f967c69 100644 --- a/spec/classes/cinder_spec.rb +++ b/spec/classes/cinder_spec.rb @@ -19,6 +19,9 @@ describe 'cinder' do should contain_cinder_config('DEFAULT/rpc_backend').with( :value => 'cinder.openstack.common.rpc.impl_kombu' ) + should contain_cinder_config('DEFAULT/control_exchange').with( + :value => 'openstack' + ) should contain_cinder_config('DEFAULT/rabbit_password').with( :value => 'guest', :secret => true