openstack
/
puppet-glance
Code Issues Proposed changes

Merge "Add $notification_driver parameter to notify::rabbitmq" into stable/juno

This commit is contained in:
Jenkins 2015-06-09 13:14:19 +00:00 committed by Gerrit Code Review
parent 616691320a d3e77427bb
commit 5bc63beb16
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/notify/rabbitmq.pp
View File

@ -35,6 +35,9 @@
# [*rabbit_durable_queues*] # [*rabbit_durable_queues*]
# Defaults to false # Defaults to false
# #
# [*notification_driver*]
# Notification driver to use. Defaults to 'messaging'.
class glance::notify::rabbitmq( class glance::notify::rabbitmq(
$rabbit_password, $rabbit_password,
$rabbit_userid = 'guest', $rabbit_userid = 'guest',
@ -51,6 +54,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,
$notification_driver = 'messaging',
) { ) {
if $rabbit_durable_queues { if $rabbit_durable_queues {
@ -75,7 +79,7 @@ class glance::notify::rabbitmq(
} }
glance_api_config { glance_api_config {
'DEFAULT/notification_driver': value => 'messaging'; 'DEFAULT/notification_driver': value => $notification_driver;
'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host; 'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host;
'DEFAULT/rabbit_password': value => $rabbit_password, secret => true; 'DEFAULT/rabbit_password': value => $rabbit_password, secret => true;
'DEFAULT/rabbit_userid': value => $rabbit_userid; 'DEFAULT/rabbit_userid': value => $rabbit_userid;