Skip to content

Commit 2694cc9

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "lib/neutron: Migrate neutron to WSGI module path"
2 parents 13888a3 + 0cd8763 commit 2694cc9

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

lib/neutron

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/d
8888
# enough
8989
NEUTRON_DEPLOY_MOD_WSGI=$(trueorfalse False NEUTRON_DEPLOY_MOD_WSGI)
9090

91+
NEUTRON_UWSGI=neutron.wsgi.api:application
9192
NEUTRON_UWSGI_CONF=$NEUTRON_CONF_DIR/neutron-api-uwsgi.ini
9293

9394
# If NEUTRON_ENFORCE_SCOPE == True, it will set "enforce_scope"
@@ -476,7 +477,7 @@ function configure_neutron {
476477
fi
477478

478479
if [ "$NEUTRON_DEPLOY_MOD_WSGI" == "True" ]; then
479-
write_uwsgi_config "$NEUTRON_UWSGI_CONF" "$NEUTRON_BIN_DIR/neutron-api" "/networking"
480+
write_uwsgi_config "$NEUTRON_UWSGI_CONF" "$NEUTRON_UWSGI" "/networking" "" "neutron-api"
480481
fi
481482
}
482483

0 commit comments

Comments
 (0)