summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-26 23:55:10 +0000
committerGerrit Code Review <review@openstack.org>2017-07-26 23:55:10 +0000
commitc3b5d2d77b029880521912e43ad963f9b0c5bf99 (patch)
tree480aa54decc76565c5abb7929552f85254fff000
parent7569c0a6bf1f847a7fe5d96a2f39ea024712b5a1 (diff)
parente5666f92d5dbff86fc3267b950ddc6812439a3f3 (diff)
Merge "In the devstack plugin, restart keystone after modifying conf"12.0.0.0b3
-rw-r--r--devstack/lib/federation.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/devstack/lib/federation.sh b/devstack/lib/federation.sh
index 62f8e02..de47e1f 100644
--- a/devstack/lib/federation.sh
+++ b/devstack/lib/federation.sh
@@ -54,6 +54,8 @@ function configure_apache {
54 cat $KEYSTONE_PLUGIN/files/federation/shib_apache_handler.txt | sudo tee -a $keystone_apache_conf 54 cat $KEYSTONE_PLUGIN/files/federation/shib_apache_handler.txt | sudo tee -a $keystone_apache_conf
55 55
56 sudo sed -i -e "s|%IDP_ID%|$IDP_ID|g;" $keystone_apache_conf 56 sudo sed -i -e "s|%IDP_ID%|$IDP_ID|g;" $keystone_apache_conf
57
58 restart_apache_server
57} 59}
58 60
59function install_federation { 61function install_federation {
@@ -107,6 +109,10 @@ function configure_federation {
107 # Specify the header that contains information about the identity provider 109 # Specify the header that contains information about the identity provider
108 iniset $KEYSTONE_CONF mapped remote_id_attribute "Shib-Identity-Provider" 110 iniset $KEYSTONE_CONF mapped remote_id_attribute "Shib-Identity-Provider"
109 111
112 if [[ "$WSGI_MODE" == "uwsgi" ]]; then
113 restart_service "devstack@keystone"
114 fi
115
110 # Register the service provider 116 # Register the service provider
111 upload_sp_metadata 117 upload_sp_metadata
112} 118}