summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorKristi Nikolla <knikolla@bu.edu>2018-02-16 17:07:03 -0500
committerKristi Nikolla <kristi@nikolla.me>2018-07-05 15:18:29 +0000
commit4155e61cecfa2af094e4eb857e3eb6fa6016f39d (patch)
tree9cfe9bf6d840e3f06c3388dc8061f750433ea704 /devstack
parentdb91bfc8c8b0a9650ef2aae0497db9c941dd207e (diff)
downloadkeystone-4155e61cecfa2af094e4eb857e3eb6fa6016f39d.tar.gz
Only upload SP metadata to testshib.org if IDP id is testshib
The upload_sp_metadata function is testshib specific and should only be called when the identity provider is testshib. Change-Id: I0dac596a51197417a3ceb8b2e1f4db5db108e84f
Diffstat (limited to 'devstack')
-rw-r--r--devstack/lib/federation.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/devstack/lib/federation.sh b/devstack/lib/federation.sh
index de47e1f9f..b93e259f4 100644
--- a/devstack/lib/federation.sh
+++ b/devstack/lib/federation.sh
@@ -74,7 +74,7 @@ function install_federation {
fi
}
-function upload_sp_metadata {
+function upload_sp_metadata_to_testshib {
local metadata_fname=${HOST_IP//./}_"$RANDOM"_sp
local metadata_url=http://$HOST_IP/Shibboleth.sso/Metadata
@@ -113,8 +113,11 @@ function configure_federation {
restart_service "devstack@keystone"
fi
- # Register the service provider
- upload_sp_metadata
+ # TODO(knikolla): We should not be relying on an external service. This
+ # will be removed once we have an idp deployed during devstack install.
+ if [[ "$IDP_ID" == "testshib" ]]; then
+ upload_sp_metadata_to_testshib
+ fi
}
function register_federation {