openstack
/
keystone
Code Issues Proposed changes

Merge "Only upload SP metadata to testshib.org if IDP id is testshib"

This commit is contained in:
Zuul 2018-07-10 22:44:28 +00:00 committed by Gerrit Code Review
parent fabba3b74f 4155e61cec
commit a006db559a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/lib/federation.sh
View File

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