From 5836d3d382993b6b8b019604791a138b00352c55 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Sat, 7 May 2016 12:33:30 +0800 Subject: [PATCH] Use oslo module for configuration Oslo module has the control_exchange parameters, so use oslo module to configure it. Change-Id: I7dcb01c0353ecc6100b3e20da946341e5a01c5bd --- manifests/init.pp | 9 ++++++--- spec/classes/mistral_init_spec.rb | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 12dd39f..569867e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -173,7 +173,7 @@ # # [*control_exchange*] # (Optional) -# Defaults to 'openstack'. +# Defaults to $::os_service_default # # [*coordination_backend_url*] # (optional) The backend URL to be used for coordination. @@ -192,7 +192,7 @@ class mistral( $rpc_backend = $::os_service_default, $auth_uri = 'http://localhost:5000/', $identity_uri = 'http://localhost:35357/', - $control_exchange = 'openstack', + $control_exchange = $::os_service_default, $rabbit_host = $::os_service_default, $rabbit_port = $::os_service_default, $rabbit_hosts = $::os_service_default, @@ -241,11 +241,14 @@ class mistral( 'keystone_authtoken/admin_tenant_name': value => $keystone_tenant; 'coordination/backend_url': value => $coordination_backend_url; 'coordination/heartbeat_interval': value => $coordination_heartbeat_interval; - 'DEFAULT/control_exchange': value => $control_exchange; 'DEFAULT/report_interval': value => $report_interval; 'DEFAULT/service_down_time': value => $service_down_time; } + oslo::messaging::default {'mistral_config': + control_exchange => $control_exchange + } + if $rpc_backend in [$::os_service_default, 'rabbit'] { oslo::messaging::rabbit {'mistral_config': diff --git a/spec/classes/mistral_init_spec.rb b/spec/classes/mistral_init_spec.rb index 7b4a710..c9fdf04 100644 --- a/spec/classes/mistral_init_spec.rb +++ b/spec/classes/mistral_init_spec.rb @@ -26,7 +26,7 @@ describe 'mistral' do it 'should contain default config' do is_expected.to contain_mistral_config('DEFAULT/rpc_backend').with(:value => 'rabbit') - is_expected.to contain_mistral_config('DEFAULT/control_exchange').with(:value => 'openstack') + is_expected.to contain_mistral_config('DEFAULT/control_exchange').with(:value => '') is_expected.to contain_mistral_config('DEFAULT/report_interval').with(:value => '') is_expected.to contain_mistral_config('DEFAULT/service_down_time').with(:value => '') is_expected.to contain_mistral_config('oslo_messaging_rabbit/rabbit_password').with(:value => '', :secret => true)