openstack/puppet-neutron
Code Issues Proposed changes

Simplify rpc_backend parameter

Browse Source 
Currently in init.pp, the value of rpc_backend must be
'neutron.openstack.common.rpc.impl_kombu' for the rabbitmq
variables to be set. Since the official guide suggests
using the alias 'rabbit' for the rpc_backend, it should
also be an accepted value.

This patch maintains backwards compatibility with the previous
default value in case it is explicitly used.

Change-Id: I05aa69bac55e06e90ab9e1d7c4f5e940853ae709
Closes-bug: #1431192
This commit is contained in:
Nathaniel Potter
2015-09-25 12:34:02 -06:00
parent 2c1bca9641
commit 7f95a4629e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@@ -123,7 +123,7 @@
# [*rpc_backend*]
# (optional) what rpc/queuing service to use
# Defaults to impl_kombu (rabbitmq)
# Defaults to rabbit (rabbitmq)
#
# [*rpc_response_timeout*]
# (optional) Seconds to wait for a response from a call
@@ -277,7 +277,7 @@ class neutron (
$report_interval = '30',
$memcache_servers = false,
$control_exchange = 'neutron',
$rpc_backend = 'neutron.openstack.common.rpc.impl_kombu',
$rpc_backend = 'rabbit',
$rpc_response_timeout = 60,
$rabbit_password = false,
$rabbit_host = 'localhost',
@@ -439,7 +439,7 @@ class neutron (
}
if $rpc_backend == 'neutron.openstack.common.rpc.impl_kombu' {
if $rpc_backend == 'rabbit' or $rpc_backend == 'neutron.openstack.common.rpc.impl_kombu' {
if ! $rabbit_password {
fail('When rpc_backend is rabbitmq, you must set rabbit password')
}
@@ -500,7 +500,7 @@ class neutron (
}
if $rpc_backend == 'neutron.openstack.common.rpc.impl_qpid' {
if $rpc_backend == 'qpid' or $rpc_backend == 'neutron.openstack.common.rpc.impl_qpid' {
neutron_config {
'DEFAULT/qpid_hostname': value => $qpid_hostname;
'DEFAULT/qpid_port': value => $qpid_port;