From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 9 Nov 2016 16:30:18 +0000 (+0000)
Subject: Merge "set url_base option in static web middleware"
X-Git-Tag: opnfv-6.0.0~1423
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3ddf0dd3efa9d9f24864963e27c58a3e19308a8d;p=apex-tripleo-heat-templates.git

Merge "set url_base option in static web middleware"
---

3ddf0dd3efa9d9f24864963e27c58a3e19308a8d
diff --cc puppet/services/swift-proxy.yaml
index ae265448,fa5fecb6..ba1d99f1
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@@ -74,8 -74,10 +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}
+             swift::proxy::staticweb::url_base: {get_param: [EndpointMap, SwiftPublic, uri_no_suffix]}
              tripleo.swift_proxy.firewall_rules:
                '122 swift proxy':
                  dport: