From a4177044973eff605ec13f3f0f56108c4158191b Mon Sep 17 00:00:00 2001
From: Morgan Fainberg <morgan.fainberg@gmail.com>
Date: Mon, 7 Jul 2014 17:01:46 -0700
Subject: [PATCH] Update toggle variable for HTTPD + mod_wsgi services

Update the devstack-gate toggle variable to match the new global
toggle for running services under alternatives to HTTPD + mod_wsgi.
This toggle only affects services that default to running under
HTTPD + mod_wsgi.

The new toggle was added in: https://review.openstack.org/#/c/101611/

Change-Id: I7ebaebf7806049fee2a6e57df628ad934b6d494c
---
 devstack-vm-gate-wrap.sh |  5 +++--
 devstack-vm-gate.sh      | 11 +++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index eb4ff82f..fde35dc5 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -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}
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 76447230..c45c87c0 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -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