Merge "set url_base option in static web middleware"
authorJenkins <jenkins@review.openstack.org>
Wed, 9 Nov 2016 16:30:18 +0000 (16:30 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 9 Nov 2016 16:30:18 +0000 (16:30 +0000)
1  2 
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: