From: Luca Lorenzetto <lorenzetto.luca@gmail.com>
Date: Fri, 14 Apr 2017 08:45:57 +0000 (+0200)
Subject: Support for external swift proxy
X-Git-Tag: opnfv-6.0.0~231^2~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=da1cae2f84914f7250aeeebd9a5c566053278735;p=apex-puppet-tripleo.git

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
---

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) {