From 3492feeedda7accb58a179c64932d4b6d154473a Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Fri, 30 Nov 2018 13:57:17 +0000 Subject: [PATCH] Use trueorfalse for NEUTRON_DEPLOY_MOD_WSGI Current code assumes the variable is being set to either "True" or "False", which will lead to weird errors if it is being set to something like "true" instead. Change-Id: I88983c9150efad882cd867c2d14d86ba6b2522c9 --- lib/neutron | 2 +- lib/neutron-legacy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/neutron b/lib/neutron index 4847e87f2f..5ef9280981 100644 --- a/lib/neutron +++ b/lib/neutron @@ -33,7 +33,7 @@ GITDIR["python-neutronclient"]=$DEST/python-neutronclient # - True : Run neutron under uwsgi # TODO(annp): Switching to uwsgi in next cycle if things turn out to be stable # enough -NEUTRON_DEPLOY_MOD_WSGI=${NEUTRON_DEPLOY_MOD_WSGI:-False} +NEUTRON_DEPLOY_MOD_WSGI=$(trueorfalse False NEUTRON_DEPLOY_MOD_WSGI) NEUTRON_AGENT=${NEUTRON_AGENT:-openvswitch} NEUTRON_DIR=$DEST/neutron NEUTRON_AUTH_CACHE_DIR=${NEUTRON_AUTH_CACHE_DIR:-/var/cache/neutron} diff --git a/lib/neutron-legacy b/lib/neutron-legacy index be5b73ffa6..9513667dfe 100644 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy @@ -91,7 +91,7 @@ export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/d # - True : Run neutron under uwsgi # TODO(annp): Switching to uwsgi in next cycle if things turn out to be stable # enough -NEUTRON_DEPLOY_MOD_WSGI=${NEUTRON_DEPLOY_MOD_WSGI:-False} +NEUTRON_DEPLOY_MOD_WSGI=$(trueorfalse False NEUTRON_DEPLOY_MOD_WSGI) NEUTRON_UWSGI_CONF=$NEUTRON_CONF_DIR/neutron-api-uwsgi.ini