Revert "Temporarily set kombu_reconnect_delay to 0.1"

This reverts commit 0de72b6.
stackhpc · Sep 5, 2023 · b5fa1bc · b5fa1bc
1 parent 80be62f
commit b5fa1bc
Show file tree

Hide file tree

Showing 30 changed files with 0 additions and 30 deletions.
diff --git a/ansible/roles/aodh/templates/aodh.conf.j2 b/ansible/roles/aodh/templates/aodh.conf.j2
@@ -61,7 +61,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = {{ service_name == 'aodh-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/barbican/templates/barbican.conf.j2 b/ansible/roles/barbican/templates/barbican.conf.j2
@@ -79,7 +79,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/blazar/templates/blazar.conf.j2 b/ansible/roles/blazar/templates/blazar.conf.j2
@@ -54,7 +54,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
@@ -36,7 +36,6 @@ ca_file = /etc/ceilometer/vmware_ca
 transport_url = {{ notify_transport_url }}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -66,7 +66,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = {{ service_name == 'cinder-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 b/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2
@@ -45,7 +45,6 @@ policy_file = {{ cloudkitty_policy_file }}
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = {{ service_name == 'cloudkitty-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/cyborg/templates/cyborg.conf.j2 b/ansible/roles/cyborg/templates/cyborg.conf.j2
@@ -58,7 +58,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/designate/templates/designate.conf.j2 b/ansible/roles/designate/templates/designate.conf.j2
@@ -94,7 +94,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -121,7 +121,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
@@ -73,7 +73,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = {{ service_name == 'heat-api' or service_name == 'heat-api-cfn' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/ironic/templates/ironic-inspector.conf.j2 b/ansible/roles/ironic/templates/ironic-inspector.conf.j2
@@ -13,7 +13,6 @@ transport_url = {{ rpc_transport_url }}
 transport_url = {{ notify_transport_url }}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = true
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2
@@ -28,7 +28,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = {{ service_name == 'ironic-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/keystone/templates/keystone.conf.j2 b/ansible/roles/keystone/templates/keystone.conf.j2
@@ -60,7 +60,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = {{ service_name == 'keystone' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2
@@ -127,7 +127,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/manila/templates/manila.conf.j2 b/ansible/roles/manila/templates/manila.conf.j2
@@ -57,7 +57,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/masakari/templates/masakari.conf.j2 b/ansible/roles/masakari/templates/masakari.conf.j2
@@ -51,7 +51,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = {{ service_name == 'masakari-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/mistral/templates/mistral.conf.j2 b/ansible/roles/mistral/templates/mistral.conf.j2
@@ -73,7 +73,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/murano/templates/murano.conf.j2 b/ansible/roles/murano/templates/murano.conf.j2
@@ -62,7 +62,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -137,7 +137,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/nova-cell/templates/nova.conf.j2 b/ansible/roles/nova-cell/templates/nova.conf.j2
@@ -185,7 +185,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
@@ -139,7 +139,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = {{ service_name == 'nova-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/octavia/templates/octavia.conf.j2 b/ansible/roles/octavia/templates/octavia.conf.j2
@@ -123,7 +123,6 @@ rpc_thread_pool_size = 2
 transport_url = {{ notify_transport_url }}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = {{ service_name == 'octavia-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/sahara/templates/sahara.conf.j2 b/ansible/roles/sahara/templates/sahara.conf.j2
@@ -41,7 +41,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/senlin/templates/senlin.conf.j2 b/ansible/roles/senlin/templates/senlin.conf.j2
@@ -69,7 +69,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/solum/templates/solum.conf.j2 b/ansible/roles/solum/templates/solum.conf.j2
@@ -68,7 +68,6 @@ memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_addres
 transport_url = {{ notify_transport_url }}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/tacker/templates/tacker.conf.j2 b/ansible/roles/tacker/templates/tacker.conf.j2
@@ -69,7 +69,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2
@@ -72,7 +72,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/vitrage/templates/vitrage.conf.j2 b/ansible/roles/vitrage/templates/vitrage.conf.j2
@@ -70,7 +70,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = {{ service_name == 'vitrage-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/watcher/templates/watcher.conf.j2 b/ansible/roles/watcher/templates/watcher.conf.j2
@@ -60,7 +60,6 @@ driver = noop
 {% endif %}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = false
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true

diff --git a/ansible/roles/zun/templates/zun.conf.j2 b/ansible/roles/zun/templates/zun.conf.j2
@@ -125,7 +125,6 @@ docker_remote_api_port = 2375
 cni_daemon_port = {{ zun_cni_daemon_port }}
 
 [oslo_messaging_rabbit]
-kombu_reconnect_delay = 0.1
 heartbeat_in_pthread = {{ service_name == 'zun-api' }}
 {% if om_enable_rabbitmq_tls | bool %}
 ssl = true