X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fswift-proxy.yaml;h=de8daea5c0fef9d08b2a1c1da2b6e8b8230840a8;hb=e60c5377fb4b6dd96a8415b03e88005b3eab603c;hp=8b990bcdaddfa70ee601d5480281b52b99f74d9a;hpb=b3aab2900ff99a3e1ac58f0794b8c66bef6d3271;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index 8b990bcd..de8daea5 100644
--- 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:
@@ -75,7 +86,9 @@ outputs:
               - admin
               - swiftoperator
               - ResellerAdmin
+            swift::proxy::versioned_writes::allow_versioned_writes: true
             swift::proxy::pipeline:
+              - 'ceilometer'
               - 'catch_errors'
               - 'healthcheck'
               - 'proxy-logging'
@@ -87,6 +100,7 @@ outputs:
               - 'authtoken'
               - 'keystone'
               - 'staticweb'
+              - 'versioned_writes'
               - 'proxy-logging'
               - 'proxy-server'
             swift::proxy::account_autocreate: true