aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/keystone.pp
diff options
context:
space:
mode:
authorLuca Lorenzetto <lorenzetto.luca@gmail.com>2017-04-14 10:45:57 +0200
committerLuca Lorenzetto <lorenzetto.luca@gmail.com>2017-04-14 10:45:57 +0200
commitda1cae2f84914f7250aeeebd9a5c566053278735 (patch)
tree9fb29ba01193ffb0a4c79c568c06cbcd8fb561c6 /manifests/profile/base/keystone.pp
parent77f45d6bf3f33ff6d0bebaf38a6f1ce1a4f21979 (diff)
Support for external swift proxy
Users may have an external swift proxy already available (i.e. radosgw from already existing ceph, or hardware appliance implementing swift proxy). With this change user may specify an environment file that registers the specified urls as endpoint for the object-store service. The internal swift proxy is left as unconfigured. Change-Id: Ia568c3a5723d8bd8c2c37dbba094fc8a83b9d67e
Diffstat (limited to 'manifests/profile/base/keystone.pp')
-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) {