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

diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index 8b990bcd..ba184ab0 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,10 @@ outputs:
             swift::proxy::authtoken::project_name: 'service'
             swift::proxy::node_timeout: {get_param: SwiftProxyNodeTimeout}
             swift::proxy::workers: {get_param: SwiftWorkers}
+            swift::proxy::ceilometer::rabbit_user: {get_param: RabbitUserName}
+            swift::proxy::ceilometer::rabbit_password: {get_param: RabbitPassword}
+            swift::proxy::staticweb::url_base: {get_param: [EndpointMap, SwiftPublic, uri_no_suffix]}
+            swift::proxy::ceilometer::nonblocking_notify: true
             tripleo.swift_proxy.firewall_rules:
               '122 swift proxy':
                 dport:
@@ -75,6 +87,7 @@ outputs:
               - admin
               - swiftoperator
               - ResellerAdmin
+            swift::proxy::versioned_writes::allow_versioned_writes: true
             swift::proxy::pipeline:
               - 'catch_errors'
               - 'healthcheck'
@@ -87,6 +100,13 @@ outputs:
               - 'authtoken'
               - 'keystone'
               - 'staticweb'
+              - 'copy'
+              - 'container-quotas'
+              - 'account-quotas'
+              - 'slo'
+              - 'dlo'
+              - 'versioned_writes'
+              - 'ceilometer'
               - 'proxy-logging'
               - 'proxy-server'
             swift::proxy::account_autocreate: true