Fix ironic_init spec tests

Four of the shared examples were never configured to run. If they had
run, they would have failed. This patch adds the examples to the ones
being run and fixes them so they pass.

Change-Id: I276d679f4e4cd3f238a3eaad71459a1b9e2ac68e
This commit is contained in:
Colleen Murphy 2016-01-25 18:28:01 -08:00
parent 4dd2bff699
commit 375c81681f

View File

@ -50,6 +50,10 @@ describe 'ironic' do
it_configures 'with SSL disabled'
it_configures 'with SSL enabled without kombu'
it_configures 'with SSL enabled with kombu'
it_configures 'with amqp_durable_queues disabled'
it_configures 'with amqp_durable_queues enabled'
it_configures 'with one glance server'
it_configures 'with two glance servers'
end
context 'and if rabbit_hosts parameter is provided' do
@ -211,7 +215,7 @@ describe 'ironic' do
shared_examples_for 'with amqp_durable_queues enabled' do
before do
params.merge( :amqp_durable_queues => true )
params.merge!( :amqp_durable_queues => true )
end
it { is_expected.to contain_ironic_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(true) }
@ -223,7 +227,7 @@ describe 'ironic' do
end
it 'should configure one glance server' do
is_expected.to contain_ironic_config('glance/glance_api_servers').with_value(p[:glance_api_servers])
is_expected.to contain_ironic_config('glance/glance_api_servers').with_value(params[:glance_api_servers])
end
end
@ -233,7 +237,7 @@ describe 'ironic' do
end
it 'should configure one glance server' do
is_expected.to contain_ironic_config('glance/glance_api_servers').with_value(p[:glance_api_servers].join(','))
is_expected.to contain_ironic_config('glance/glance_api_servers').with_value(params[:glance_api_servers].join(','))
end
end