openstack/devstack-gate
Code Issues Proposed changes

Merge "Update toggle variable for HTTPD + mod_wsgi services"

Browse Source
This commit is contained in:
Jenkins
2014-07-11 17:11:15 +00:00
committed by Gerrit Code Review
parent b7b7ed08b5 a417704497
commit 344cd2286a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
devstack-vm-gate-wrap.sh
View File

@@ -190,8 +190,9 @@ export DEVSTACK_GATE_CONFIGDRIVE=${DEVSTACK_GATE_CONFIGDRIVE:-1}
# Set to 1 to enable running a keystone v3 based gate
export DEVSTACK_GATE_KEYSTONE_V3=${DEVSTACK_GATE_KEYSTONE_V3:-0}
# Set to 1 to configure Keystone to run under mod_wsgi and HTTPD
export DEVSTACK_GATE_USE_APACHE=${DEVSTACK_GATE_USE_APACHE:-0}
# Set to 0 to run services that default under Apache + mod_wsgi under alternatives (e.g. eventlet)
# if possible
export DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES=${DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES:-1}
# Set to 1 to enable the Nova v3 API tests
export DEVSTACK_GATE_TEMPEST_NOVA_V3_API=${DEVSTACK_GATE_TEMPEST_NOVA_V3_API:-0}

11
devstack-vm-gate.sh
View File

@@ -221,12 +221,11 @@ EOF
echo "TEMPEST_AUTH_VERSION=v3" >>localrc
fi
if [[ "$DEVSTACK_GATE_USE_APACHE" -eq "0" ]]; then
# Disable running services that can run under alternatives from Apache
# (e.g. Keystone under eventlet) from being configured to run under
# Apache. This will affect all services that run under HTTPD (mod_wsgi)
# by default.
echo "APACHE_ENABLED_SERVICES=" >> localrc
if [[ "$DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES" -eq "0" ]]; then
# Services that default to run under Apache + mod_wsgi will use alternatives
# (e.g. Keystone under eventlet) if available. This will affect all services
# that run under HTTPD (mod_wsgi) by default.
echo "ENABLE_HTTPD_MOD_WSGI_SERVICES=False" >> localrc
fi
if [[ "$DEVSTACK_GATE_TEMPEST_NOVA_V3_API" -eq "1" ]]; then
echo "TEMPEST_NOVA_API_V3=True" >> localrc