openstack
/
fuel-library
Code Issues Proposed changes

Fix notification driver and strategy values 

To make glance ceilometer notifications to work.

Change-Id: I75e13e3cc5fdfad413b460323bb870de3565ff5a
Closes-Bug: 1314196
This commit is contained in:
Dmitry Ilyin 2014-06-24 14:17:21 +04:00
parent 8ec900a2bc
commit c991a844ca
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/puppet/glance/manifests/api.pp
View File

@ -89,7 +89,6 @@ class glance::api(
$clean_minute = 0,
$clean_ensure = 'present',
$image_cache_max_size = '10737418240',
$notify_mech = 'noop',
) inherits glance {
# used to configure concat
@ -126,15 +125,6 @@ class glance::api(
fail("Invalid db connection ${sql_connection}")
}
if $notify_mech == 'noop'
{
glance_api_config { 'DEFAULT/notifier_strategy': value => 'noop'; }
}
else
{
include "glance::notify::${notify_mech}"
}
# Logging
if $log_file {
glance_api_config {

11
deployment/puppet/glance/manifests/notify/qpid.pp
View File

@ -9,11 +9,12 @@ class glance::notify::qpid(
) inherits glance::api {
glance_api_config {
'DEFAULT/notifier_strategy': value => 'qpid';
'DEFAULT/qpid_host': value => $qpid_host;
'DEFAULT/qpid_port': value => $qpid_port;
'DEFAULT/qpid_username': value => $qpid_username;
'DEFAULT/qpid_password': value => $qpid_password;
'DEFAULT/notifier_strategy': value => 'qpid';
'DEFAULT/notification_driver': value => 'messaging';
'DEFAULT/qpid_host': value => $qpid_host;
'DEFAULT/qpid_port': value => $qpid_port;
'DEFAULT/qpid_username': value => $qpid_username;
'DEFAULT/qpid_password': value => $qpid_password;
}
}

1
deployment/puppet/glance/manifests/notify/rabbitmq.pp
View File

@ -43,6 +43,7 @@ class glance::notify::rabbitmq(
glance_api_config {
'DEFAULT/notification_driver': value => 'messaging';
'DEFAULT/notifier_strategy': value => 'rabbit';
'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host;
'DEFAULT/rabbit_password': value => $rabbit_password;
'DEFAULT/rabbit_userid': value => $rabbit_userid;