rabbitmq SSL: check puppet resource instead of config in spec tests
The configuration is done via the oslo::messaging::rabbit resource from puppet-oslo. We should be checking for the resource that we're using instead of the underlying configuration file. Change-Id: Ibb82146271482f6ae2db03e0e541cce8abe59409
This commit is contained in:
parent
2571db744d
commit
a8983125f8
|
@ -148,13 +148,13 @@ describe 'ironic' do
|
|||
)
|
||||
end
|
||||
|
||||
it do
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true')
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('/path/to/ssl/ca/certs')
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('/path/to/ssl/cert/file')
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('/path/to/ssl/keyfile')
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1')
|
||||
end
|
||||
it { is_expected.to contain_oslo__messaging__rabbit('ironic_config').with(
|
||||
:rabbit_use_ssl => params[:rabbit_use_ssl],
|
||||
:kombu_ssl_ca_certs => params[:kombu_ssl_ca_certs],
|
||||
:kombu_ssl_certfile => params[:kombu_ssl_certfile],
|
||||
:kombu_ssl_keyfile => params[:kombu_ssl_keyfile],
|
||||
:kombu_ssl_version => params[:kombu_ssl_version],
|
||||
)}
|
||||
end
|
||||
|
||||
shared_examples_for 'with SSL enabled without kombu' do
|
||||
|
@ -164,13 +164,9 @@ describe 'ironic' do
|
|||
)
|
||||
end
|
||||
|
||||
it do
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true')
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('<SERVICE DEFAULT>')
|
||||
end
|
||||
it { is_expected.to contain_oslo__messaging__rabbit('ironic_config').with(
|
||||
:rabbit_use_ssl => params[:rabbit_use_ssl],
|
||||
)}
|
||||
end
|
||||
|
||||
shared_examples_for 'with SSL disabled' do
|
||||
|
@ -180,13 +176,9 @@ describe 'ironic' do
|
|||
)
|
||||
end
|
||||
|
||||
it do
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('false')
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('<SERVICE DEFAULT>')
|
||||
end
|
||||
it { is_expected.to contain_oslo__messaging__rabbit('ironic_config').with(
|
||||
:rabbit_use_ssl => params[:rabbit_use_ssl],
|
||||
)}
|
||||
end
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue