openstack/devstack
Code Issues Proposed changes

Use apache2ctl after apache is installed.

Browse Source 
Ensure that apache2ctl is only called if apache2 is being used when
setting up Keystone. This patch corrects a case where apache2ctl
is being called at the time lib/keystone is being sourced. This
error breaks attempts to deploy Keystone under apache unless
apache is already installed at the time stack.sh is run.

Change-Id: I02d426438fa1246effd68c6bb3c3358910ed4c05
This commit is contained in:
Morgan Fainberg 2014-06-09 12:07:29 -07:00
parent c1699c27d1
commit 970ee9083e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/keystone
View File

@ -87,10 +87,6 @@ if is_ssl_enabled_service "key"; then
KEYSTONE_SERVICE_PROTOCOL="https" KEYSTONE_SERVICE_PROTOCOL="https"
fi fi
# Apache configuration file for keystone
KEYSTONE_APACHE_CONF_FILE=$(apache_site_config_for keystone)
# Functions # Functions
# --------- # ---------
# cleanup_keystone() - Remove residual data files, anything left over from previous # cleanup_keystone() - Remove residual data files, anything left over from previous
@ -106,18 +102,20 @@ function cleanup_keystone {
function _cleanup_keystone_apache_wsgi { function _cleanup_keystone_apache_wsgi {
sudo rm -f $KEYSTONE_WSGI_DIR/*.wsgi sudo rm -f $KEYSTONE_WSGI_DIR/*.wsgi
disable_apache_site keystone disable_apache_site keystone
sudo rm -f $KEYSTONE_APACHE_CONF_FILE sudo rm -f $(apache_site_config_for keystone)
} }
# _config_keystone_apache_wsgi() - Set WSGI config files of Keystone # _config_keystone_apache_wsgi() - Set WSGI config files of Keystone
function _config_keystone_apache_wsgi { function _config_keystone_apache_wsgi {
sudo mkdir -p $KEYSTONE_WSGI_DIR sudo mkdir -p $KEYSTONE_WSGI_DIR
local keystone_apache_conf=$(apache_site_config_for keystone)
# copy proxy vhost and wsgi file # copy proxy vhost and wsgi file
sudo cp $KEYSTONE_DIR/httpd/keystone.py $KEYSTONE_WSGI_DIR/main sudo cp $KEYSTONE_DIR/httpd/keystone.py $KEYSTONE_WSGI_DIR/main
sudo cp $KEYSTONE_DIR/httpd/keystone.py $KEYSTONE_WSGI_DIR/admin sudo cp $KEYSTONE_DIR/httpd/keystone.py $KEYSTONE_WSGI_DIR/admin
sudo cp $FILES/apache-keystone.template $KEYSTONE_APACHE_CONF_FILE sudo cp $FILES/apache-keystone.template $keystone_apache_conf
sudo sed -e " sudo sed -e "
s|%PUBLICPORT%|$KEYSTONE_SERVICE_PORT|g; s|%PUBLICPORT%|$KEYSTONE_SERVICE_PORT|g;
s|%ADMINPORT%|$KEYSTONE_AUTH_PORT|g; s|%ADMINPORT%|$KEYSTONE_AUTH_PORT|g;
@ -125,7 +123,7 @@ function _config_keystone_apache_wsgi {
s|%PUBLICWSGI%|$KEYSTONE_WSGI_DIR/main|g; s|%PUBLICWSGI%|$KEYSTONE_WSGI_DIR/main|g;
s|%ADMINWSGI%|$KEYSTONE_WSGI_DIR/admin|g; s|%ADMINWSGI%|$KEYSTONE_WSGI_DIR/admin|g;
s|%USER%|$STACK_USER|g s|%USER%|$STACK_USER|g
" -i $KEYSTONE_APACHE_CONF_FILE " -i $keystone_apache_conf
enable_apache_site keystone enable_apache_site keystone
} }