openstack/puppet-neutron
Code Issues Proposed changes

Merge "Don't handle obsolete rpc_backend values"

Browse Source
This commit is contained in:
Jenkins 2016-12-11 02:04:31 +00:00 committed by Gerrit Code Review
commit 509e3a98d2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,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')
}