@@ -87,10 +87,6 @@ if is_ssl_enabled_service "key"; then
8787 KEYSTONE_SERVICE_PROTOCOL="https"
8888fi
8989
90- # Apache configuration file for keystone
91- KEYSTONE_APACHE_CONF_FILE=$(apache_site_config_for keystone)
92-
93-
9490# Functions
9591# ---------
9692# cleanup_keystone() - Remove residual data files, anything left over from previous
@@ -106,26 +102,28 @@ function cleanup_keystone {
106102function _cleanup_keystone_apache_wsgi {
107103 sudo rm -f $KEYSTONE_WSGI_DIR/*.wsgi
108104 disable_apache_site keystone
109- sudo rm -f $KEYSTONE_APACHE_CONF_FILE
105+ sudo rm -f $(apache_site_config_for keystone)
110106}
111107
112108# _config_keystone_apache_wsgi() - Set WSGI config files of Keystone
113109function _config_keystone_apache_wsgi {
114110 sudo mkdir -p $KEYSTONE_WSGI_DIR
115111
112+ local keystone_apache_conf=$(apache_site_config_for keystone)
113+
116114 # copy proxy vhost and wsgi file
117115 sudo cp $KEYSTONE_DIR/httpd/keystone.py $KEYSTONE_WSGI_DIR/main
118116 sudo cp $KEYSTONE_DIR/httpd/keystone.py $KEYSTONE_WSGI_DIR/admin
119117
120- sudo cp $FILES/apache-keystone.template $KEYSTONE_APACHE_CONF_FILE
118+ sudo cp $FILES/apache-keystone.template $keystone_apache_conf
121119 sudo sed -e "
122120 s|%PUBLICPORT%|$KEYSTONE_SERVICE_PORT|g;
123121 s|%ADMINPORT%|$KEYSTONE_AUTH_PORT|g;
124122 s|%APACHE_NAME%|$APACHE_NAME|g;
125123 s|%PUBLICWSGI%|$KEYSTONE_WSGI_DIR/main|g;
126124 s|%ADMINWSGI%|$KEYSTONE_WSGI_DIR/admin|g;
127125 s|%USER%|$STACK_USER|g
128- " -i $KEYSTONE_APACHE_CONF_FILE
126+ " -i $keystone_apache_conf
129127 enable_apache_site keystone
130128}
131129
0 commit comments