Browse code
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
Jens Harbott authored on 2018/11/30 22:57:17Showing 2 changed files
| ... | ... |
@@ -33,7 +33,7 @@ GITDIR["python-neutronclient"]=$DEST/python-neutronclient |
| 33 | 33 |
# - True : Run neutron under uwsgi |
| 34 | 34 |
# TODO(annp): Switching to uwsgi in next cycle if things turn out to be stable |
| 35 | 35 |
# enough |
| 36 |
-NEUTRON_DEPLOY_MOD_WSGI=${NEUTRON_DEPLOY_MOD_WSGI:-False}
|
|
| 36 |
+NEUTRON_DEPLOY_MOD_WSGI=$(trueorfalse False NEUTRON_DEPLOY_MOD_WSGI) |
|
| 37 | 37 |
NEUTRON_AGENT=${NEUTRON_AGENT:-openvswitch}
|
| 38 | 38 |
NEUTRON_DIR=$DEST/neutron |
| 39 | 39 |
NEUTRON_AUTH_CACHE_DIR=${NEUTRON_AUTH_CACHE_DIR:-/var/cache/neutron}
|
| ... | ... |
@@ -91,7 +91,7 @@ export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/d
|
| 91 | 91 |
# - True : Run neutron under uwsgi |
| 92 | 92 |
# TODO(annp): Switching to uwsgi in next cycle if things turn out to be stable |
| 93 | 93 |
# enough |
| 94 |
-NEUTRON_DEPLOY_MOD_WSGI=${NEUTRON_DEPLOY_MOD_WSGI:-False}
|
|
| 94 |
+NEUTRON_DEPLOY_MOD_WSGI=$(trueorfalse False NEUTRON_DEPLOY_MOD_WSGI) |
|
| 95 | 95 |
|
| 96 | 96 |
NEUTRON_UWSGI_CONF=$NEUTRON_CONF_DIR/neutron-api-uwsgi.ini |
| 97 | 97 |
|