Merge "Remove rabbit_use_ssl in class swift::proxy::ceilometer"

This commit is contained in:
Jenkins 2017-01-16 13:29:54 +00:00 committed by Gerrit Code Review
commit 17b466ffd7

View File

@ -6,7 +6,6 @@ class packstack::swift::ceilometer ()
$rabbit_password = hiera('CONFIG_AMQP_AUTH_PASSWORD') $rabbit_password = hiera('CONFIG_AMQP_AUTH_PASSWORD')
class { '::swift::proxy::ceilometer': class { '::swift::proxy::ceilometer':
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/", default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
topic => 'notifications', topic => 'notifications',
control_exchange => 'swift', control_exchange => 'swift',