aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-17 18:06:40 +0000
committerGerrit Code Review <review@openstack.org>2017-04-17 18:06:41 +0000
commitf3b4c34b2f93c068d2f473cfae3ed1494803c473 (patch)
treedfc6ec5bcf75961d5772db6d461c8542e40eff0d
parent7b08425741e4e49c8ea1c3ca34e5797fd24cce05 (diff)
parentda1cae2f84914f7250aeeebd9a5c566053278735 (diff)
Merge "Support for external swift proxy"
-rw-r--r--manifests/profile/base/keystone.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index ec896e7..290abee 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -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) {