Merge "In the devstack plugin, restart keystone after modifying conf"12.0.0.0b3

1 files changed, 6 insertions, 0 deletions

diff --git a/devstack/lib/federation.sh b/devstack/lib/federation.sh
index 62f8e0264..de47e1f9f 100644
--- a/devstack/lib/federation.sh
+++ b/devstack/lib/federation.sh
@@ -54,6 +54,8 @@ function configure_apache {
     cat $KEYSTONE_PLUGIN/files/federation/shib_apache_handler.txt | sudo tee -a $keystone_apache_conf
 
     sudo sed -i -e "s|%IDP_ID%|$IDP_ID|g;" $keystone_apache_conf
+
+    restart_apache_server
 }
 
 function install_federation {
@@ -107,6 +109,10 @@ function configure_federation {
     # Specify the header that contains information about the identity provider
     iniset $KEYSTONE_CONF mapped remote_id_attribute "Shib-Identity-Provider"
 
+    if [[ "$WSGI_MODE" == "uwsgi" ]]; then
+        restart_service "devstack@keystone"
+    fi
+
     # Register the service provider
     upload_sp_metadata
 }