| commit | 5f35bfd2a76097147abd6de78a77e45399b927ff | [log] [tgz] |
|---|---|---|
| author | Zuul <zuul@review.opendev.org> | Thu Jun 20 09:59:22 2024 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Thu Jun 20 09:59:22 2024 +0000 |
| tree | e1c96034341ebefd2d94404fcce1e3d8edbd2583 | |
| parent | f6adb245bbb1a19ada9b7c434699a5019e68fce6 [diff] | |
| parent | 608489cd59b0d0f6f82937abb6a317489ac4d7a4 [diff] |
Merge "openrc: Stop setting OS_TENANT_NAME"
diff --git a/lib/neutron b/lib/neutron index ed854fd..8b65980 100644 --- a/lib/neutron +++ b/lib/neutron
@@ -1022,7 +1022,7 @@ Q_API_PASTE_FILE=$NEUTRON_CONF_DIR/api-paste.ini cp $NEUTRON_DIR/etc/api-paste.ini $Q_API_PASTE_FILE - if [[ -n "$NEUTRON_ENDPOINT_SERVICE_NAME" ]]; then + if [[ "$NEUTRON_DEPLOY_MOD_WSGI" == "False" && -n "$NEUTRON_ENDPOINT_SERVICE_NAME" ]]; then _replace_api_paste_composite fi