Merge "Remove double tcp_listen_options entries for rabbit"

[apex-tripleo-heat-templates.git] / puppet / services / swift-proxy.yaml

diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index ed0d12c..de8daea 100644 (file)
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -41,6 +41,14 @@ parameters:
   MonitoringSubscriptionSwiftProxy:
     default: 'overcloud-swift-proxy'
     type: string
+  RabbitPassword:
+    description: The password for RabbitMQ
+    type: string
+    hidden: true
+  RabbitUserName:
+    default: guest
+    description: The username for RabbitMQ
+    type: string
 
 resources:
   SwiftBase:
@@ -66,6 +74,9 @@ outputs:
             swift::proxy::authtoken::project_name: 'service'
             swift::proxy::node_timeout: {get_param: SwiftProxyNodeTimeout}
             swift::proxy::workers: {get_param: SwiftWorkers}
+            swift::proxy::ceilometer::rabbit_host: {get_param: [ServiceNetMap, RabbitmqNetwork]}
+            swift::proxy::ceilometer::rabbit_user: {get_param: RabbitUserName}
+            swift::proxy::ceilometer::rabbit_password: {get_param: RabbitPassword}
             tripleo.swift_proxy.firewall_rules:
               '122 swift proxy':
                 dport:
@@ -77,6 +88,7 @@ outputs:
               - ResellerAdmin
             swift::proxy::versioned_writes::allow_versioned_writes: true
             swift::proxy::pipeline:
+              - 'ceilometer'
               - 'catch_errors'
               - 'healthcheck'
               - 'proxy-logging'