Update Apache + mod_wsgi deployment mechanisms
Added a global toggle for enabling HTTPD + mod_wsgi for services that default deploy to running under Apache. When the variable ``ENABLE_HTTPD_MOD_WSGI_SERVICES`` is set to ``True`` any service that recommends deploying under HTTPD + mod_wsgi, will be run under Apache. If ``ENABLE_HTTPD_MOD_WSGI_SERVICES`` is set to ``False`` the any service that is defaulted to running under HTTPD + mod_wsgi will (if capable) be run in an alternate deployment strategy (e.g. eventlet). Updated Swift and Keystone to have individual toggles for deploying under HTTPD + mod_wsgi. This is done to allow for gate to run on the services under mod_wsgi where appropriate. Toggles are ``KEYSTONE_USE_MOD_WSGI`` and ``SWIFT_USE_MOD_WSGI`` and are both defaulted to "False" (do not deploy under HTTPD + mod_wsgi). Change-Id: Id3b121b8f1cde369d184b586e0d875bdbda34813
This commit is contained in:
-18
@@ -8,7 +8,6 @@
|
||||
#
|
||||
# lib/apache exports the following functions:
|
||||
#
|
||||
# - is_apache_enabled_service
|
||||
# - install_apache_wsgi
|
||||
# - config_apache_wsgi
|
||||
# - apache_site_config_for
|
||||
@@ -42,23 +41,6 @@ fi
|
||||
|
||||
# Functions
|
||||
# ---------
|
||||
|
||||
# is_apache_enabled_service() checks if the service(s) specified as arguments are
|
||||
# apache enabled by the user in ``APACHE_ENABLED_SERVICES`` as web front end.
|
||||
#
|
||||
# Multiple services specified as arguments are ``OR``'ed together; the test
|
||||
# is a short-circuit boolean, i.e it returns on the first match.
|
||||
#
|
||||
# Uses global ``APACHE_ENABLED_SERVICES``
|
||||
# APACHE_ENABLED_SERVICES service [service ...]
|
||||
function is_apache_enabled_service {
|
||||
services=$@
|
||||
for service in ${services}; do
|
||||
[[ ,${APACHE_ENABLED_SERVICES}, =~ ,${service}, ]] && return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# install_apache_wsgi() - Install Apache server and wsgi module
|
||||
function install_apache_wsgi {
|
||||
# Apache installation, because we mark it NOPRIME
|
||||
|
||||
Reference in New Issue
Block a user