commit 3480093b937b45e05f12d2af9df26d076f05067e
author Dr. Jens Harbott <j.harbott@x-ion.de> Thu Feb 13 09:38:35 2020 +0000
committer Jens Harbott <j.harbott@x-ion.de> Tue Jun 23 08:04:18 2020 +0200
tree 23c1d3338118620045d2ba8b930e462069104b1b
parent f1ed7c77c50ac28cb58c9f7ed885c6a3e0a75403

Make devstack run on focal (Ubuntu LTS 20.04)

- Add a nodeset and a platform job
- Drop uwsgi-py2 pkg that no longer exists
- Blacklist tests that are currently failing

Change-Id: Ib4416dc2f5e003fd770f5240a8f78213c56af8e6

lib/apache

diff --git a/lib/apache b/lib/apache
index a3e9f95..a5fbf75 100644
--- a/lib/apache
+++ b/lib/apache
@@ -96,10 +96,11 @@
     fi
 
     if is_ubuntu; then
-        install_package uwsgi \
-                        uwsgi-plugin-python \
-                        uwsgi-plugin-python3 \
-                        libapache2-mod-proxy-uwsgi
+        local pkg_list="uwsgi uwsgi-plugin-python3 libapache2-mod-proxy-uwsgi"
+        if "$DISTRO" == 'bionic'; then
+            pkg_list="${pkg_list} uwsgi-plugin-python"
+        fi
+        install_package ${pkg_list}
     elif is_fedora; then
         # Note httpd comes with mod_proxy_uwsgi and it is loaded by
         # default; the mod_proxy_uwsgi package actually conflicts now.