openstack/aodh
Code Issues Proposed changes

Merge "Revert "Disable GLOBAL_VENV""

Browse Source
This commit is contained in:
Zuul 2024-11-16 17:16:44 +00:00 committed by Gerrit Code Review
commit 9cfff3f6d5
3 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.zuul.yaml
View File

@ -21,9 +21,6 @@
- ^tools/.*$ - ^tools/.*$
- ^tox.ini$ - ^tox.ini$
vars: vars:
# TODO: Update the plugins so they work with global venv
devstack_localrc:
GLOBAL_VENV: False
devstack_local_conf: devstack_local_conf:
test-config: test-config:
$TEMPEST_CONFIG: $TEMPEST_CONFIG:
@ -32,9 +29,6 @@
- telemetry-dsvm-integration-ipv6-only: - telemetry-dsvm-integration-ipv6-only:
irrelevant-files: *aodh-irrelevant-files irrelevant-files: *aodh-irrelevant-files
vars: vars:
# TODO: Update the plugins so they work with global venv
devstack_localrc:
GLOBAL_VENV: False
devstack_local_conf: devstack_local_conf:
test-config: test-config:
$TEMPEST_CONFIG: $TEMPEST_CONFIG:
@ -63,9 +57,6 @@
- telemetry-dsvm-integration: - telemetry-dsvm-integration:
irrelevant-files: *aodh-irrelevant-files irrelevant-files: *aodh-irrelevant-files
vars: vars:
# TODO: Update the plugins so they work with global venv
devstack_localrc:
GLOBAL_VENV: False
devstack_local_conf: devstack_local_conf:
test-config: test-config:
$TEMPEST_CONFIG: $TEMPEST_CONFIG:
@ -77,9 +68,6 @@
- telemetry-dsvm-integration-ipv6-only: - telemetry-dsvm-integration-ipv6-only:
irrelevant-files: *aodh-irrelevant-files irrelevant-files: *aodh-irrelevant-files
vars: vars:
# TODO: Update the plugins so they work with global venv
devstack_localrc:
GLOBAL_VENV: False
devstack_local_conf: devstack_local_conf:
test-config: test-config:
$TEMPEST_CONFIG: $TEMPEST_CONFIG:
@ -115,8 +103,6 @@
DATABASE_TYPE: postgresql DATABASE_TYPE: postgresql
AODH_BACKEND: postgresql AODH_BACKEND: postgresql
USE_PYTHON3: True USE_PYTHON3: True
# TODO: Update the plugins so they work with global venv
GLOBAL_VENV: False
devstack_local_conf: devstack_local_conf:
test-config: test-config:
$TEMPEST_CONFIG: $TEMPEST_CONFIG:
@ -136,8 +122,6 @@
devstack_localrc: devstack_localrc:
AODH_BACKEND: "mysql" AODH_BACKEND: "mysql"
USE_PYTHON3: True USE_PYTHON3: True
# TODO: Update the plugins so they work with global venv
GLOBAL_VENV: False
devstack_local_conf: devstack_local_conf:
test-config: test-config:
$TEMPEST_CONFIG: $TEMPEST_CONFIG:

18
devstack/plugin.sh
View File

@ -20,24 +20,6 @@ else
AODH_BIN_DIR=$(get_python_exec_prefix) AODH_BIN_DIR=$(get_python_exec_prefix)
fi fi
if [ -z "$AODH_DEPLOY" ]; then
# Default
AODH_DEPLOY=simple
# Fallback to common wsgi devstack configuration
if [ "$ENABLE_HTTPD_MOD_WSGI_SERVICES" == "True" ]; then
AODH_DEPLOY=mod_wsgi
# Deprecated config
elif [ -n "$AODH_USE_MOD_WSGI" ] ; then
echo_summary "AODH_USE_MOD_WSGI is deprecated, use AODH_DEPLOY instead"
if [ "$AODH_USE_MOD_WSGI" == True ]; then
AODH_DEPLOY=mod_wsgi
fi
fi
fi
# Test if any Aodh services are enabled # Test if any Aodh services are enabled
# is_aodh_enabled # is_aodh_enabled
function is_aodh_enabled { function is_aodh_enabled {

3
devstack/settings
View File

@ -25,8 +25,7 @@ AODH_SERVICE_PORT=${AODH_SERVICE_PORT:-8042}
# - mod_wsgi : Run Aodh under Apache HTTPd mod_wsgi # - mod_wsgi : Run Aodh under Apache HTTPd mod_wsgi
# - simple : Run aodh-api # - simple : Run aodh-api
# - uwsgi : Run Aodh under uwsgi # - uwsgi : Run Aodh under uwsgi
# - <empty>: Fallback to AODH_USE_MOD_WSGI or ENABLE_HTTPD_MOD_WSGI_SERVICES AODH_DEPLOY=${AODH_DEPLOY:-uwsgi}
AODH_DEPLOY=${AODH_DEPLOY}
AODH_NOTIFICATION_TOPICS=${AODH_NOTIFICATION_TOPICS:-notifications} AODH_NOTIFICATION_TOPICS=${AODH_NOTIFICATION_TOPICS:-notifications}