openstack/puppet-neutron
Code Issues Proposed changes

Merge "Remove validations of oslo::messaging::* parameters"

Browse Source
This commit is contained in:
Zuul
2022-01-28 14:50:13 +00:00
committed by Gerrit Code Review
parent ceb9ac4d07 b61c657ba9
commit 275ad8ef75
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/init.pp
View File

@@ -427,15 +427,6 @@ will be removed in a future release.')
} }
} }
if (is_service_default($kombu_ssl_certfile) and ! is_service_default($kombu_ssl_keyfile))
or (is_service_default($kombu_ssl_keyfile) and ! is_service_default($kombu_ssl_certfile)) {
fail('The kombu_ssl_certfile and kombu_ssl_keyfile parameters must be used together')
}
if ! is_service_default($kombu_missing_consumer_retry_timeout) and ! is_service_default($rpc_response_timeout)
and ($kombu_missing_consumer_retry_timeout > $rpc_response_timeout) {
warning('kombu_missing_consumer_retry_timeout should not be longer than rpc_response_timeout')
}
package { 'neutron': package { 'neutron':
ensure => $package_ensure, ensure => $package_ensure,
name => $::neutron::params::package_name, name => $::neutron::params::package_name,

8
spec/classes/neutron_init_spec.rb
View File

@@ -279,14 +279,6 @@ describe 'neutron' do
) )
end end
context 'without required parameters' do
context 'without kombu_ssl_keyfile parameter' do
before { params.delete(:kombu_ssl_keyfile) }
it { should raise_error(Puppet::Error, /The kombu_ssl_certfile and kombu_ssl_keyfile parameters must be used together/) }
end
end
end end
shared_examples 'with state and lock paths set' do shared_examples 'with state and lock paths set' do