openstack/puppet-nova
Code Issues Proposed changes

Fix unit test

Browse Source 
The rpc_backend option has been removed in puppet-oslo[0], so we should
remove it.

[0]https://review.openstack.org/#/c/489264/

Change-Id: Ic8215534e5b73a7ba24a34e85dfef134ff8caa76
Closes-Bug: #1708976
This commit is contained in:
ZhongShengping
2017-08-07 14:13:08 +08:00
parent 30a205c3ad
commit cd223bf4dc
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spec/classes/nova_init_spec.rb
View File

@@ -42,7 +42,6 @@ describe 'nova' do
end end
it 'configures rabbit' do it 'configures rabbit' do
is_expected.to contain_nova_config('DEFAULT/rpc_backend').with_value('rabbit')
is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_host').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_host').with_value('<SERVICE DEFAULT>')
is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_password').with_value('<SERVICE DEFAULT>').with_secret(true) is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_password').with_value('<SERVICE DEFAULT>').with_secret(true)
is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_port').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_port').with_value('<SERVICE DEFAULT>')
@@ -84,7 +83,6 @@ describe 'nova' do
:default_transport_url => 'rabbit://rabbit_user:password@localhost:5673', :default_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
:rpc_response_timeout => '30', :rpc_response_timeout => '30',
:control_exchange => 'nova', :control_exchange => 'nova',
:rpc_backend => 'rabbit',
:rabbit_host => 'rabbit', :rabbit_host => 'rabbit',
:rabbit_userid => 'rabbit_user', :rabbit_userid => 'rabbit_user',
:rabbit_port => '5673', :rabbit_port => '5673',
@@ -141,7 +139,6 @@ describe 'nova' do
end end
it 'configures rabbit' do it 'configures rabbit' do
is_expected.to contain_nova_config('DEFAULT/rpc_backend').with_value('rabbit')
is_expected.to contain_nova_config('DEFAULT/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673') is_expected.to contain_nova_config('DEFAULT/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673')
is_expected.to contain_nova_config('DEFAULT/rpc_response_timeout').with_value('30') is_expected.to contain_nova_config('DEFAULT/rpc_response_timeout').with_value('30')
is_expected.to contain_nova_config('DEFAULT/control_exchange').with_value('nova') is_expected.to contain_nova_config('DEFAULT/control_exchange').with_value('nova')
@@ -334,14 +331,6 @@ describe 'nova' do
)} )}
end end
context 'with rabbitmq rpc_backend with old parameter' do
let :params do
{ :rpc_backend => 'nova.openstack.common.rpc.impl_kombu' }
end
it { is_expected.to contain_nova_config('DEFAULT/rpc_backend').with_value('rabbit') }
end
context 'with amqp default parameters' do context 'with amqp default parameters' do
it 'configures amqp' do it 'configures amqp' do
is_expected.to contain_nova_config('oslo_messaging_amqp/server_request_prefix').with_value('<SERVICE DEFAULT>') is_expected.to contain_nova_config('oslo_messaging_amqp/server_request_prefix').with_value('<SERVICE DEFAULT>')