From 234335f3cbebd62d8ed2fee45a26a684f594a76c Mon Sep 17 00:00:00 2001
From: Alexey Deryugin <aderyugin@mirantis.com>
Date: Mon, 16 May 2016 17:14:12 +0300
Subject: [PATCH] Use default value of kombu_reconnect_delay for all services

Current reconnection time is 5.0 which is pretty long.
This patch switches kombu_reconnect_delay to its default
value - 1.0 which is the same for all services.

Change-Id: I8e0230bf48620a8b5e1d7339e419b9b682e5cbd8
Closes-bug: #1560097
Closes-Bug: #1440134
---
 deployment/puppet/openstack/manifests/cinder.pp  | 3 ---
 deployment/puppet/openstack/manifests/glance.pp  | 3 ---
 deployment/puppet/openstack/manifests/network.pp | 1 -
 3 files changed, 7 deletions(-)

diff --git a/deployment/puppet/openstack/manifests/cinder.pp b/deployment/puppet/openstack/manifests/cinder.pp
index ab3686be74..08ab6ecd77 100644
--- a/deployment/puppet/openstack/manifests/cinder.pp
+++ b/deployment/puppet/openstack/manifests/cinder.pp
@@ -109,9 +109,6 @@ class openstack::cinder(
         database_idle_timeout => $idle_timeout,
         control_exchange      => 'cinder',
       }
-      cinder_config {
-        'DEFAULT/kombu_reconnect_delay': value => '5.0';
-      }
     }
     'qpid': {
       $rpc_backend = 'cinder.openstack.common.rpc.impl_qpid'
diff --git a/deployment/puppet/openstack/manifests/glance.pp b/deployment/puppet/openstack/manifests/glance.pp
index 031cfed827..fddcf33457 100644
--- a/deployment/puppet/openstack/manifests/glance.pp
+++ b/deployment/puppet/openstack/manifests/glance.pp
@@ -175,9 +175,6 @@ class openstack::glance (
   # but we pass it as a amqp_hosts string of 'node:port, node:port' in Fuel
   if !is_array($rabbit_hosts) {
     $rabbit_hosts_real = split($rabbit_hosts, ',')
-    glance_api_config {
-      'DEFAULT/kombu_reconnect_delay': value => 5.0;
-    }
   } else {
     $rabbit_hosts_real = $rabbit_hosts
   }
diff --git a/deployment/puppet/openstack/manifests/network.pp b/deployment/puppet/openstack/manifests/network.pp
index eceff8d46f..21449efb39 100644
--- a/deployment/puppet/openstack/manifests/network.pp
+++ b/deployment/puppet/openstack/manifests/network.pp
@@ -163,7 +163,6 @@ class openstack::network (
         rabbit_hosts            => $amqp_hosts,
         rabbit_port             => $amqp_port,
         rabbit_password         => $amqp_password,
-        kombu_reconnect_delay   => '5.0',
         network_device_mtu      => $net_mtu,
       }