From bbd8b784b16c9dba905781ad048566dbd54f4232 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Sat, 3 Dec 2016 03:36:39 +0000
Subject: [PATCH] Don't handle obsolete rpc_backend values
Those are not supported as of Ocata:
I9e66140ad0b10c50e216c78e4914c98313cada05.
Change-Id: If99cce3c1c908206a914cbdca67bb2b64f0c6f8d
---
manifests/agents/ml2/linuxbridge.pp | 2 +-
manifests/init.pp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/manifests/agents/ml2/linuxbridge.pp b/manifests/agents/ml2/linuxbridge.pp
index 4564c4798..612ca315e 100644
--- a/manifests/agents/ml2/linuxbridge.pp
+++ b/manifests/agents/ml2/linuxbridge.pp
@@ -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']
diff --git a/manifests/init.pp b/manifests/init.pp
index 7eeab86ef..76adbc61c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -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')
}