Revert "Disable GLOBAL_VENV"

This reverts commit 8de7585f37.

Reason for revert:
Current devstack disables GLOBAL_VENV automatically in CentOS or Rocky
so we don't have to override the option. GLOBAL_VENV=True is required
to migrate the jobs to Ubuntu 24.04 (Noble) .

This also changes the default API deployment method to uwsgi because
uwsgi is now globally used in CI and only works for global venv
method.

Conflicts:
	.zuul.yaml

Change-Id: Iec6ab6b4fcdb60caa67197acb5ada0678c0309ce

.zuul.yaml

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

devstack/plugin.sh

@@ -20,24 +20,6 @@ else
     AODH_BIN_DIR=$(get_python_exec_prefix)
 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
 # is_aodh_enabled
 function is_aodh_enabled {

devstack/settings

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