openstack
/
keystone
Code Issues Proposed changes

Merge "Add OpenSUSE support in devstack federation plugin"

This commit is contained in:
Zuul 2019-02-18 03:02:02 +00:00 committed by Gerrit Code Review
parent 96bce72ae8 32d92f8012
commit 0ab594a077
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devstack/lib/federation.sh
View File

@ -80,10 +80,19 @@ function install_federation {
# Create a new keypair for Shibboleth # Create a new keypair for Shibboleth
sudo /etc/shibboleth/keygen.sh -f -o /etc/shibboleth sudo /etc/shibboleth/keygen.sh -f -o /etc/shibboleth
# Start Shibboleth module
start_service shibd
elif is_suse; then
# Install Shibboleth
install_package shibboleth-sp
# Create a new keypair for Shibboleth
sudo /etc/shibboleth/keygen.sh -f -o /etc/shibboleth
# Start Shibboleth module # Start Shibboleth module
start_service shibd start_service shibd
else else
echo "Skipping installation of shibboleth for non ubuntu nor fedora host" echo "Skipping installation of shibboleth for non ubuntu nor fedora nor suse host"
fi fi
} }
@ -126,6 +135,8 @@ function configure_federation {
restart_service "devstack@keystone" restart_service "devstack@keystone"
fi fi
restart_apache_server
# TODO(knikolla): We should not be relying on an external service. This # TODO(knikolla): We should not be relying on an external service. This
# will be removed once we have an idp deployed during devstack install. # will be removed once we have an idp deployed during devstack install.
if [[ "$IDP_ID" == "samltest" ]]; then if [[ "$IDP_ID" == "samltest" ]]; then
@ -172,7 +183,9 @@ function uninstall_federation {
# Remove Shibboleth repository # Remove Shibboleth repository
sudo rm /etc/yum.repos.d/shibboleth.repo sudo rm /etc/yum.repos.d/shibboleth.repo
elif is_suse; then
unistall_package shibboleth-sp
else else
echo "Skipping uninstallation of shibboleth for non ubuntu nor fedora host" echo "Skipping uninstallation of shibboleth for non ubuntu nor fedora nor suse host"
fi fi
} }