From b48df2f5bbb203b784184dc7ed8ca552433c9fb9 Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin.lu@huawei.com>
Date: Thu, 30 Mar 2017 18:49:45 -0400
Subject: [PATCH] Enable WSGI mode in gate only

In before, zun devstack plugin enabled wsgi mode by default. This
patch proposed the reverse: disable wsgi mode by default. This fall
back to the screen mode if users haven't explicitly set
ZUN_USE_MOD_WSGI to True. However, we enable wsgi mode in gate to
satisfy the requirement of community wsgi goal [1].

The rational of this change is to ease the development process by
running zun-api at screen, which is more dev-friendly than running
it in apache2/httpd. In screen, it is easier to do dev operations
like shutdown/restart/debug.

[1] https://governance.openstack.org/tc/goals/pike/
    deploy-api-in-wsgi.html

Change-Id: I8b47a23e94de8676c415a66da2097fc69ceb8336
---
 devstack/settings              | 1 -
 zun/tests/contrib/gate_hook.sh | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/settings b/devstack/settings
index 92b8eb940..d2b6944a1 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -19,7 +19,6 @@
 enable_service zun-api
 enable_service zun-compute
 
-ZUN_USE_MOD_WSGI=True
 if [[ ${ZUN_DB_TYPE} == "etcd" ]]; then
     enable_service zun-etcd
 fi
diff --git a/zun/tests/contrib/gate_hook.sh b/zun/tests/contrib/gate_hook.sh
index a43b18d40..dc9ea55ec 100755
--- a/zun/tests/contrib/gate_hook.sh
+++ b/zun/tests/contrib/gate_hook.sh
@@ -22,6 +22,7 @@ driver=$1
 db=$2
 
 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"ZUN_USE_MOD_WSGI=True"
 
 if [ "$driver" = "docker" ]; then
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"ZUN_DRIVER=docker"