Merge "Multiple fixes to unblock CI"

3 files changed, 16 insertions, 56 deletions

diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
index 9b734498f..35a9b9900 100644
--- a/.zuul.d/centos.yaml
+++ b/.zuul.d/centos.yaml
@@ -2,15 +2,10 @@
 - project:
     check:
       jobs:
-        - kolla-build-centos-binary
-        - kolla-build-centos-source
         - kolla-build-centos8-binary
         - kolla-build-centos8-source
-        - kolla-ansible-centos-source
         - kolla-ansible-centos8-source
-        - kolla-ansible-centos-binary
         - kolla-ansible-centos8-binary
-        - kolla-ansible-centos-source-upgrade
         - tripleo-build-containers-centos-8:
             voting: false
             files:
@@ -20,51 +15,32 @@
               - ^requirements.txt$
               - ^setup.cfg$
               - ^setup.py$
-        - kolla-ansible-bifrost-centos-source:
-            files: ^docker\/(base|bifrost|openstack-base)\/.*
         # FIXME(mgoddard): Bifrost deploy jobs not yet passing.
         # - kolla-ansible-centos8-source-bifrost:
         #     files: ^docker\/(base|bifrost|openstack-base)\/.*
         # Test rabbitmq & mariadb changes in multinode ceph jobs.
-        - kolla-ansible-centos-source-ceph-ansible:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-        - kolla-ansible-centos-source-upgrade-ceph-ansible:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-        - kolla-ansible-centos-source-zun:
-            files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
         - kolla-ansible-centos8-source-zun:
             files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
-        - kolla-ansible-centos-source-scenario-nfv:
-            files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.*
         - kolla-ansible-centos8-source-scenario-nfv:
             files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.*
-        - kolla-ansible-centos-source-ironic:
-            files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
         - kolla-ansible-centos8-source-ironic:
             files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
     gate:
       queue: kolla
       jobs:
-        - kolla-build-centos-source
         - kolla-build-centos8-source
-        - kolla-ansible-centos-source
         - kolla-ansible-centos8-source
-        - kolla-ansible-centos-source-upgrade
     periodic:
       jobs:
-        - kolla-publish-centos-source
-        - kolla-publish-centos-binary
         - kolla-publish-centos8-source
         - kolla-publish-centos8-binary
     release:
       jobs:
-        - kolla-publish-centos-source
-        - kolla-publish-centos-binary
         - kolla-publish-centos8-source
         - kolla-publish-centos8-binary
 
 - job:
-    name: kolla-build-centos-binary
+    name: kolla-build-centos8-binary
     parent: kolla-base
     nodeset: kolla-centos8
     voting: false
@@ -72,16 +48,11 @@
       action: build
       base_distro: centos
       install_type: binary
-
-- job:
-    name: kolla-build-centos8-binary
-    parent: kolla-build-centos-binary
-    vars:
       base_tag: 8
 
 - job:
-    name: kolla-publish-centos-binary
-    parent: kolla-build-centos-binary
+    name: kolla-publish-centos8-binary
+    parent: kolla-build-centos8-binary
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
@@ -89,37 +60,20 @@
       - kolla_dockerhub_creds
 
 - job:
-    name: kolla-publish-centos8-binary
-    parent: kolla-publish-centos-binary
-    vars:
-      base_tag: 8
-
-- job:
-    name: kolla-build-centos-source
+    name: kolla-build-centos8-source
     parent: kolla-base
     nodeset: kolla-centos8
     vars:
       action: build
       base_distro: centos
       install_type: source
-
-- job:
-    name: kolla-build-centos8-source
-    parent: kolla-build-centos-source
-    vars:
       base_tag: 8
 
 - job:
-    name: kolla-publish-centos-source
-    parent: kolla-build-centos-source
+    name: kolla-publish-centos8-source
+    parent: kolla-build-centos8-source
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
     secrets:
       - kolla_dockerhub_creds
-
-- job:
-    name: kolla-publish-centos8-source
-    parent: kolla-publish-centos-source
-    vars:
-      base_tag: 8
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index c826f0692..44ebaf329 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -79,8 +79,10 @@ RUN {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("
 
 ENV PATH {{ virtualenv_path }}/bin:$PATH
 
+# NOTE(mgoddard): Ansible 2.8.9 broke OpenStack modules.
+# https://bugs.launchpad.net/kolla/+bug/1866181
 {% set kolla_toolbox_pip_packages = [
-        'ansible==2.8.*',
+        'ansible==2.8.*,!=2.8.9',
         'cmd2',
         'influxdb',
         'mysqlclient',
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 12920586e..88951d9c0 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -292,10 +292,14 @@ _BASE_OPTS = [
 
 
 SOURCES = {
+    # FIXME(mgoddard): Pinning requirements to
+    # ea42244642c3c091cb4f70917ae8d79af217b6af. This is required to avoid
+    # oslo.cache 2.1.0, which breaks us. See
+    # https://bugs.launchpad.net/kolla-ansible/+bug/1866008.
     'openstack-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/requirements/'
-                     'requirements-${openstack_branch}.tar.gz')},
+        'type': 'git',
+        'location': 'https://opendev.org/openstack/requirements',
+        'reference': 'ea42244642c3c091cb4f70917ae8d79af217b6af'},
     'aodh-base': {
         'type': 'url',
         'location': ('$tarballs_base/aodh/'