openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Support for external swift proxy"

This commit is contained in:
Jenkins 2017-04-17 18:06:40 +00:00 committed by Gerrit Code Review
parent 7b08425741 da1cae2f84
commit f3b4c34b2f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/keystone.pp
View File

@ -321,7 +321,7 @@ class tripleo::profile::base::keystone (
if hiera('sahara_api_enabled', false) {
include ::sahara::keystone::auth
}
if hiera('swift_proxy_enabled', false) {
if hiera('swift_proxy_enabled', false) or hiera('external_swift_proxy_enabled',false) {
include ::swift::keystone::auth
}
if hiera('tacker_enabled', false) {