openstack/puppet-neutron
Code Issues Proposed changes

Don't handle obsolete rpc_backend values

Browse Source 
Those are not supported as of Ocata:
I9e66140ad0b10c50e216c78e4914c98313cada05.

Change-Id: If99cce3c1c908206a914cbdca67bb2b64f0c6f8d
This commit is contained in:
Ihar Hrachyshka
2016-12-03 03:36:39 +00:00
parent cbe9fd1207
commit bbd8b784b1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/agents/ml2/linuxbridge.pp
View File

@@ -157,7 +157,7 @@ class neutron::agents::ml2::linuxbridge (
}
}
if $::neutron::rpc_backend == 'neutron.openstack.common.rpc.impl_kombu' {
if $::neutron::rpc_backend in [$::os_service_default, 'rabbit'] {
$linuxbridge_agent_subscribe = [
Neutron_config['oslo_messaging_rabbit/rabbit_hosts'],
Neutron_config['DEFAULT/transport_url']

2
manifests/init.pp
View File

@@ -576,7 +576,7 @@ deprecated. Please use neutron::default_transport_url instead.")
}
}
if $rpc_backend in [$::os_service_default, 'neutron.openstack.common.rpc.impl_kombu', 'rabbit'] {
if $rpc_backend in [$::os_service_default, 'rabbit'] {
if is_service_default($default_transport_url) and is_service_default($rabbit_password) {
fail('When rpc_backend is rabbitmq, you must set rabbit password')
}