openstack
/
fuel-library
Code Issues Proposed changes

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: I0d2418f940e7036ad71264da7ad10d7a32bb329b
Closes-bug: #1560097
Closes-Bug: #1440134
This commit is contained in:
Alexey Deryugin 2016-05-16 17:07:04 +03:00
parent 0387ee09fc
commit 1722961c12
6 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/puppet/nova/spec/classes/nova_init_spec.rb
View File

@ -252,16 +252,6 @@ describe 'nova' do
end
end
context 'with kombu_reconnect_delay set to 5.0' do
let :params do
{ :kombu_reconnect_delay => '5.0' }
end
it 'configures rabbit' do
is_expected.to contain_nova_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('5.0')
end
end
context 'with rabbit_ha_queues set to true' do
let :params do
{ :rabbit_ha_queues => 'true' }

3
deployment/puppet/openstack/manifests/cinder.pp
View File

@ -113,9 +113,6 @@ class openstack::cinder(
database_max_overflow => $max_overflow,
control_exchange => 'cinder',
}
cinder_config {
'DEFAULT/kombu_reconnect_delay': value => '5.0';
}
}
'qpid': {
$rpc_backend = 'cinder.openstack.common.rpc.impl_qpid'

1
deployment/puppet/openstack/manifests/compute.pp
View File

@ -255,7 +255,6 @@ class openstack::compute (
rabbit_hosts => split($amqp_hosts, ','),
rabbit_userid => $amqp_user,
rabbit_password => $amqp_password,
kombu_reconnect_delay => '5.0',
image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => $glance_api_servers,
verbose => $verbose,

3
deployment/puppet/openstack/manifests/glance.pp
View File

@ -183,9 +183,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
}

1
deployment/puppet/openstack/manifests/network.pp
View File

@ -186,7 +186,6 @@ class openstack::network (
rabbit_hosts => $amqp_hosts,
rabbit_port => $amqp_port,
rabbit_password => $amqp_password,
kombu_reconnect_delay => '5.0',
network_device_mtu => $network_device_mtu,
}

1
deployment/puppet/openstack/manifests/nova/controller.pp
View File

@ -230,7 +230,6 @@ class openstack::nova::controller (
rabbit_hosts => split($amqp_hosts, ','),
rabbit_userid => $amqp_user,
rabbit_password => $amqp_password,
kombu_reconnect_delay => '5.0',
image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => $glance_connection,
verbose => $verbose,