Merge "Use OS::Heat::DeployedServer"

[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 de8daea..ba184ab 100644 (file)
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -74,9 +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_host: {get_param: [ServiceNetMap, RabbitmqNetwork]}
             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:
@@ -88,7 +89,6 @@ outputs:
               - ResellerAdmin
             swift::proxy::versioned_writes::allow_versioned_writes: true
             swift::proxy::pipeline:
-              - 'ceilometer'
               - 'catch_errors'
               - 'healthcheck'
               - 'proxy-logging'
@@ -100,7 +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