openstack
/
fuel-library
Code Issues Proposed changes

Enable RabbitMQ heartbeats by default 

Use defaults for heartbeat_timeout_threshold and
heartbeat_rate parameters for all openstack services
except Neutron: heartbeats don't properly work for it.

Change-Id: I72b2d76f56516e69532549bf6c2c6c468ff47089
Closes-bug: #1584004
This commit is contained in:
iberezovskiy 2016-05-20 17:57:23 +03:00 committed by Ivan Berezovskiy
parent bc0dab3528
commit b6e69d7363
12 changed files with 88 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp
View File

@ -44,20 +44,19 @@ class openstack_tasks::ceilometer::compute {
if ($ceilometer_enabled) {
class { '::ceilometer':
rabbit_heartbeat_timeout_threshold => 0,
http_timeout => $ceilometer_hash['http_timeout'],
event_time_to_live => $ceilometer_hash['event_time_to_live'],
metering_time_to_live => $ceilometer_hash['metering_time_to_live'],
alarm_history_time_to_live => $ceilometer_hash['alarm_history_time_to_live'],
rabbit_hosts => split(hiera('amqp_hosts',''), ','),
rabbit_userid => $amqp_user,
rabbit_password => $amqp_password,
metering_secret => $ceilometer_metering_secret,
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
http_timeout => $ceilometer_hash['http_timeout'],
event_time_to_live => $ceilometer_hash['event_time_to_live'],
metering_time_to_live => $ceilometer_hash['metering_time_to_live'],
alarm_history_time_to_live => $ceilometer_hash['alarm_history_time_to_live'],
rabbit_hosts => split(hiera('amqp_hosts',''), ','),
rabbit_userid => $amqp_user,
rabbit_password => $amqp_password,
metering_secret => $ceilometer_metering_secret,
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
}
class { '::ceilometer::agent::auth':

27
deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp
View File

@ -121,20 +121,19 @@ class openstack_tasks::ceilometer::controller {
if ($ceilometer_enabled) {
class { '::ceilometer':
rabbit_heartbeat_timeout_threshold => 0,
http_timeout => $ceilometer_hash['http_timeout'],
event_time_to_live => $ceilometer_hash['event_time_to_live'],
metering_time_to_live => $ceilometer_hash['metering_time_to_live'],
alarm_history_time_to_live => $ceilometer_hash['alarm_history_time_to_live'],
rabbit_hosts => split(hiera('amqp_hosts',''), ','),
rabbit_userid => $amqp_user,
rabbit_password => $amqp_password,
metering_secret => $ceilometer_metering_secret,
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
http_timeout => $ceilometer_hash['http_timeout'],
event_time_to_live => $ceilometer_hash['event_time_to_live'],
metering_time_to_live => $ceilometer_hash['metering_time_to_live'],
alarm_history_time_to_live => $ceilometer_hash['alarm_history_time_to_live'],
rabbit_hosts => split(hiera('amqp_hosts',''), ','),
rabbit_userid => $amqp_user,
rabbit_password => $amqp_password,
metering_secret => $ceilometer_metering_secret,
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
}
# Configure authentication for agents

13
deployment/puppet/openstack_tasks/manifests/glance/glance.pp
View File

@ -245,13 +245,12 @@ class openstack_tasks::glance::glance {
}
class { '::glance::notify::rabbitmq':
rabbit_heartbeat_timeout_threshold => 0,
rabbit_notification_exchange => 'glance',
rabbit_notification_topic => 'notifications',
rabbit_password => $rabbit_password,
rabbit_userid => $rabbit_userid,
rabbit_hosts => $rabbit_hosts,
notification_driver => $ceilometer_hash['notification_driver'],
rabbit_notification_exchange => 'glance',
rabbit_notification_topic => 'notifications',
rabbit_password => $rabbit_password,
rabbit_userid => $rabbit_userid,
rabbit_hosts => $rabbit_hosts,
notification_driver => $ceilometer_hash['notification_driver'],
}
# syslog additional settings default/use_syslog_rfc_format = true

35
deployment/puppet/openstack_tasks/manifests/ironic/ironic_compute.pp
View File

@ -69,25 +69,24 @@ class openstack_tasks::ironic::ironic_compute {
}
class { '::nova':
ensure_package => installed,
database_connection => $db_connection,
rpc_backend => 'nova.openstack.common.rpc.impl_kombu',
ensure_package => installed,
database_connection => $db_connection,
rpc_backend => 'nova.openstack.common.rpc.impl_kombu',
#FIXME(bogdando) we have to split amqp_hosts until all modules synced
rabbit_hosts => split($amqp_hosts, ','),
rabbit_userid => $rabbit_hash['user'],
rabbit_password => $rabbit_hash['password'],
rabbit_heartbeat_timeout_threshold => 0,
image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => $glance_api_servers,
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
log_facility => $syslog_log_facility_nova,
state_path => $nova_hash['state_path'],
report_interval => $nova_report_interval,
service_down_time => $nova_service_down_time,
notify_on_state_change => $notify_on_state_change,
memcached_servers => $memcached_addresses,
rabbit_hosts => split($amqp_hosts, ','),
rabbit_userid => $rabbit_hash['user'],
rabbit_password => $rabbit_hash['password'],
image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => $glance_api_servers,
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
log_facility => $syslog_log_facility_nova,
state_path => $nova_hash['state_path'],
report_interval => $nova_report_interval,
service_down_time => $nova_service_down_time,
notify_on_state_change => $notify_on_state_change,
memcached_servers => $memcached_addresses,
}
class { '::nova::compute':

47
deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp
View File

@ -180,31 +180,30 @@ class openstack_tasks::openstack_controller::openstack_controller {
#################################################################
class { '::nova':
database_connection => $db_connection,
api_database_connection => $api_db_connection,
rpc_backend => $rpc_backend,
database_connection => $db_connection,
api_database_connection => $api_db_connection,
rpc_backend => $rpc_backend,
#FIXME(bogdando) we have to split amqp_hosts until all modules synced
rabbit_hosts => split($amqp_hosts, ','),
rabbit_userid => $amqp_user,
rabbit_password => $amqp_password,
rabbit_heartbeat_timeout_threshold => 0,
image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => $glance_api_servers,
debug => $debug,
log_facility => $syslog_log_facility_nova,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
database_idle_timeout => $idle_timeout,
report_interval => $nova_report_interval,
service_down_time => $nova_service_down_time,
notify_api_faults => pick($nova_hash['notify_api_faults'], false),
notification_driver => $ceilometer_hash['notification_driver'],
notify_on_state_change => $nova_notify_on_state_change,
memcached_servers => $memcached_addresses,
cinder_catalog_info => pick($nova_hash['cinder_catalog_info'], 'volumev2:cinderv2:internalURL'),
database_max_pool_size => $max_pool_size,
database_max_retries => $max_retries,
database_max_overflow => $max_overflow,
rabbit_hosts => split($amqp_hosts, ','),
rabbit_userid => $amqp_user,
rabbit_password => $amqp_password,
image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => $glance_api_servers,
debug => $debug,
log_facility => $syslog_log_facility_nova,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
database_idle_timeout => $idle_timeout,
report_interval => $nova_report_interval,
service_down_time => $nova_service_down_time,
notify_api_faults => pick($nova_hash['notify_api_faults'], false),
notification_driver => $ceilometer_hash['notification_driver'],
notify_on_state_change => $nova_notify_on_state_change,
memcached_servers => $memcached_addresses,
cinder_catalog_info => pick($nova_hash['cinder_catalog_info'], 'volumev2:cinderv2:internalURL'),
database_max_pool_size => $max_pool_size,
database_max_retries => $max_retries,
database_max_overflow => $max_overflow,
}
# TODO(aschultz): this is being removed in M, do we need it?

33
deployment/puppet/openstack_tasks/manifests/roles/compute.pp
View File

@ -265,24 +265,23 @@ class openstack_tasks::roles::compute {
$notify_on_state_change = 'vm_and_task_state'
class { '::nova':
rpc_backend => $queue_provider,
rpc_backend => $queue_provider,
#FIXME(bogdando) we have to split amqp_hosts until all modules synced
rabbit_hosts => split(hiera('amqp_hosts',''), ','),
rabbit_userid => pick($rabbit_hash['user'], 'nova'),
rabbit_password => $rabbit_hash['password'],
rabbit_heartbeat_timeout_threshold => 0,
glance_api_servers => $glance_api_servers,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
state_path => $nova_hash_real['state_path'],
report_interval => $nova_report_interval,
service_down_time => $nova_service_down_time,
notify_on_state_change => $notify_on_state_change,
notification_driver => $ceilometer_hash['notification_driver'],
memcached_servers => $memcached_addresses,
cinder_catalog_info => pick($nova_hash_real['cinder_catalog_info'], 'volumev2:cinderv2:internalURL'),
rabbit_hosts => split(hiera('amqp_hosts',''), ','),
rabbit_userid => pick($rabbit_hash['user'], 'nova'),
rabbit_password => $rabbit_hash['password'],
glance_api_servers => $glance_api_servers,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
state_path => $nova_hash_real['state_path'],
report_interval => $nova_report_interval,
service_down_time => $nova_service_down_time,
notify_on_state_change => $notify_on_state_change,
notification_driver => $ceilometer_hash['notification_driver'],
memcached_servers => $memcached_addresses,
cinder_catalog_info => pick($nova_hash_real['cinder_catalog_info'], 'volumev2:cinderv2:internalURL'),
}
class { '::nova::availability_zone':

1
tests/noop/spec/hosts/ceilometer/compute_spec.rb
View File

@ -75,7 +75,6 @@ describe manifest do
it 'should properly configure rabbit queue' do
should contain_ceilometer_config('DEFAULT/rpc_backend').with(:value => 'rabbit')
should contain_ceilometer_config('oslo_messaging_rabbit/rabbit_virtual_host').with(:value => '/')
should contain_ceilometer_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with(:value => '0')
should contain_ceilometer_config('oslo_messaging_rabbit/rabbit_use_ssl').with(:value => 'false')
end

1
tests/noop/spec/hosts/ceilometer/controller_spec.rb
View File

@ -189,7 +189,6 @@ describe manifest do
it 'should properly configure rabbit queue' do
should contain_ceilometer_config('DEFAULT/rpc_backend').with(:value => 'rabbit')
should contain_ceilometer_config('oslo_messaging_rabbit/rabbit_virtual_host').with(:value => '/')
should contain_ceilometer_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with(:value => '0')
should contain_ceilometer_config('oslo_messaging_rabbit/rabbit_use_ssl').with(:value => 'false')
end

2
tests/noop/spec/hosts/glance/glance_spec.rb
View File

@ -234,8 +234,6 @@ describe manifest do
should contain_glance_api_config('DEFAULT/rpc_backend').with(:value => 'rabbit')
should contain_glance_registry_config('DEFAULT/rpc_backend').with(:value => 'rabbit')
should contain_glance_api_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with(:value => '0')
should contain_glance_registry_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with(:value => '0')
should contain_glance_api_config('oslo_messaging_rabbit/default_notification_exchange').with(:value => 'glance')
should contain_glance_registry_config('oslo_messaging_rabbit/default_notification_exchange').with(:value => 'glance')
should contain_glance_api_config('oslo_messaging_notifications/topics').with(:value => 'notifications')

1
tests/noop/spec/hosts/ironic/ironic-compute_spec.rb
View File

@ -61,7 +61,6 @@ describe manifest do
end
it 'nova config should have proper queue settings' do
should contain_nova_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with(:value => '0')
end
it 'nova config should have reserved_host_memory_mb set to 0' do

4
tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
View File

@ -163,10 +163,6 @@ describe manifest do
should contain_nova_config('DEFAULT/default_log_levels').with_value(default_log_levels.sort.join(','))
end
it 'nova config should have proper queue settings' do
should contain_nova_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with(:value => '0')
end
# Nova config options
it 'nova config should have use_stderr set to false' do
should contain_nova_config('DEFAULT/use_stderr').with(

4
tests/noop/spec/hosts/roles/compute_spec.rb
View File

@ -303,10 +303,6 @@ describe manifest do
configuration_override.fetch('nova_paste_api_ini', {})
end
it 'nova config should have proper queue settings' do
should contain_nova_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with(:value => '0')
end
# Nova.config options
it 'nova config should have proper live_migration_flag' do
should contain_nova_config('libvirt/live_migration_flag').with(