Disable notifications in Nova and Glance without Ceilometer
Currently, even if Ceilomemter isn't enabled, notifications for the Nova and Glance services on the controller nodes are enabled. The notification.* queues are being filled up, but no consumer reads from them. Glance changes are taken from I3f2c29adbfb605ef288962f72ba81c11811cb35 Change-Id: I00db51ceb4121e73bfe7e256b895e4fae122a496 Closes-Bug: 1425982
This commit is contained in:
parent
08cebf0b51
commit
f7cea2502b
@ -51,6 +51,7 @@ class glance::notify::rabbitmq(
|
|||||||
$rabbit_notification_topic = 'notifications',
|
$rabbit_notification_topic = 'notifications',
|
||||||
$rabbit_durable_queues = false,
|
$rabbit_durable_queues = false,
|
||||||
$amqp_durable_queues = false,
|
$amqp_durable_queues = false,
|
||||||
|
$ceilometer = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
if $rabbit_durable_queues {
|
if $rabbit_durable_queues {
|
||||||
@ -75,7 +76,6 @@ class glance::notify::rabbitmq(
|
|||||||
}
|
}
|
||||||
|
|
||||||
glance_api_config {
|
glance_api_config {
|
||||||
'DEFAULT/notification_driver': value => 'messaging';
|
|
||||||
'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host;
|
'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host;
|
||||||
'DEFAULT/rabbit_password': value => $rabbit_password;
|
'DEFAULT/rabbit_password': value => $rabbit_password;
|
||||||
'DEFAULT/rabbit_userid': value => $rabbit_userid;
|
'DEFAULT/rabbit_userid': value => $rabbit_userid;
|
||||||
@ -85,6 +85,12 @@ class glance::notify::rabbitmq(
|
|||||||
'DEFAULT/amqp_durable_queues': value => $amqp_durable_queues_real;
|
'DEFAULT/amqp_durable_queues': value => $amqp_durable_queues_real;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $ceilometer {
|
||||||
|
glance_api_config { 'DEFAULT/notification_driver': value => 'messaging' }
|
||||||
|
} else {
|
||||||
|
glance_api_config { 'DEFAULT/notification_driver': ensure => absent }
|
||||||
|
}
|
||||||
|
|
||||||
if $rabbit_use_ssl {
|
if $rabbit_use_ssl {
|
||||||
glance_api_config { 'DEFAULT/kombu_ssl_version': value => $kombu_ssl_version }
|
glance_api_config { 'DEFAULT/kombu_ssl_version': value => $kombu_ssl_version }
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ describe 'glance::notify::rabbitmq' do
|
|||||||
let :params do
|
let :params do
|
||||||
{:rabbit_password => 'pass'}
|
{:rabbit_password => 'pass'}
|
||||||
end
|
end
|
||||||
it { should contain_glance_api_config('DEFAULT/notification_driver').with_value('messaging') }
|
it { should contain_glance_api_config('DEFAULT/notification_driver').with_ensure('absent') }
|
||||||
it { should contain_glance_api_config('DEFAULT/rabbit_password').with_value('pass') }
|
it { should contain_glance_api_config('DEFAULT/rabbit_password').with_value('pass') }
|
||||||
it { should contain_glance_api_config('DEFAULT/rabbit_userid').with_value('guest') }
|
it { should contain_glance_api_config('DEFAULT/rabbit_userid').with_value('guest') }
|
||||||
it { should contain_glance_api_config('DEFAULT/rabbit_host').with_value('localhost') }
|
it { should contain_glance_api_config('DEFAULT/rabbit_host').with_value('localhost') }
|
||||||
|
@ -91,6 +91,7 @@ class openstack::nova::controller (
|
|||||||
$nova_report_interval = '10',
|
$nova_report_interval = '10',
|
||||||
$nova_service_down_time = '60',
|
$nova_service_down_time = '60',
|
||||||
$cinder = true,
|
$cinder = true,
|
||||||
|
$ceilometer = false,
|
||||||
# SQLAlchemy backend
|
# SQLAlchemy backend
|
||||||
$idle_timeout = '3600',
|
$idle_timeout = '3600',
|
||||||
$max_pool_size = '10',
|
$max_pool_size = '10',
|
||||||
@ -243,8 +244,10 @@ class openstack::nova::controller (
|
|||||||
$memcached_addresses = suffix($cache_server_ip, inline_template(":<%= @cache_server_port %>"))
|
$memcached_addresses = suffix($cache_server_ip, inline_template(":<%= @cache_server_port %>"))
|
||||||
|
|
||||||
# From legacy ceilometer notifications for nova
|
# From legacy ceilometer notifications for nova
|
||||||
|
if ($ceilometer) {
|
||||||
$notify_on_state_change = 'vm_and_task_state'
|
$notify_on_state_change = 'vm_and_task_state'
|
||||||
$notification_driver = 'messaging'
|
$notification_driver = 'messaging'
|
||||||
|
}
|
||||||
|
|
||||||
class { 'nova':
|
class { 'nova':
|
||||||
install_utilities => false,
|
install_utilities => false,
|
||||||
|
Loading…
Reference in New Issue
Block a user