Merge pull request #99 from stackhpc/sync/gerrit/stable/victoria

Sync/gerrit/stable/victoria
stackhpc · Mar 23, 2022 · a015a76 · a015a76
2 parents 42af7c3 + 6f01297
commit a015a76
Show file tree

Hide file tree

Showing 40 changed files with 246 additions and 217 deletions.
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
@@ -51,12 +51,6 @@
           LfDhCLDD3VtnVOrj4UxZsjzmPbday1fziua/7f+CXsShC5erz0ZM65rMCwkjWeI6Kc63A
           0M27tl+OWHO3KkfFR4tWc3dws3r1kYjQeds0adBHyYD0eL8SJfwZkbtojAQ1JM=
 
-- nodeset:
-    name: kolla-centos8
-    nodes:
-      - name: primary
-        label: centos-8
-
 - nodeset:
     name: kolla-centos8-stream
     nodes:
@@ -75,12 +69,6 @@
       - name: primary
         label: debian-buster
 
-- nodeset:
-    name: kolla-centos8-aarch64
-    nodes:
-      - name: primary
-        label: centos-8-arm64
-
 - nodeset:
     name: kolla-centos8-stream-aarch64
     nodes:

diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml
@@ -2,75 +2,34 @@
 - project:
     check:
       jobs:
-        - kolla-build-centos8-binary
-        - kolla-build-centos8-source
         - kolla-build-centos8s-binary
         - kolla-build-centos8s-source
-        - kolla-ansible-centos8-source
-        - kolla-ansible-centos8-binary
-        - kolla-ansible-centos8-source-upgrade
         - kolla-ansible-centos8s-source
         - kolla-ansible-centos8s-binary
         - kolla-ansible-centos8s-source-upgrade
     check-arm64:
       jobs:
-        - kolla-build-centos8-source-aarch64
         - kolla-build-centos8s-source-aarch64
     gate:
       queue: kolla
       jobs:
-        - kolla-build-centos8-source
         - kolla-build-centos8s-source
-        - kolla-ansible-centos8-source
-        - kolla-ansible-centos8-source-upgrade
         - kolla-ansible-centos8s-source
         - kolla-ansible-centos8s-source-upgrade
     periodic:
       jobs:
-        - kolla-publish-centos8-source-quay
-        - kolla-publish-centos8-binary-quay
         - kolla-publish-centos8s-source-quay
         - kolla-publish-centos8s-binary-quay
     periodic-weekly:
       jobs:
-        - kolla-publish-centos8-source-dockerhub
-        - kolla-publish-centos8-binary-dockerhub
         - kolla-publish-centos8s-source-dockerhub
         - kolla-publish-centos8s-binary-dockerhub
     release:
       jobs:
-        - kolla-publish-centos8-source-dockerhub
-        - kolla-publish-centos8-binary-dockerhub
         - kolla-publish-centos8s-source-dockerhub
         - kolla-publish-centos8s-binary-dockerhub
     experimental:
       jobs:
-        - kolla-build-no-infra-wheels-centos8-source
-        - kolla-ansible-centos8-source-bifrost:
-            files: ^docker\/(base|bifrost|openstack-base)\/.*
-        # Test rabbitmq & mariadb changes in multinode ceph jobs.
-        - kolla-ansible-centos8-source-ceph-ansible:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-        - kolla-ansible-centos8-source-upgrade-ceph-ansible:
-            files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
-        - kolla-ansible-centos8-source-zun:
-            files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
-        - kolla-ansible-centos8-source-scenario-nfv:
-            files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.*
-        - kolla-ansible-centos8-source-ironic:
-            files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
-        - kolla-ansible-centos8-source-swift:
-            files: ^docker/(base|openstack-base|glance|swift)/
-        - kolla-ansible-centos8-source-mariadb:
-            files: ^docker/(base|mariadb)/
-        - kolla-ansible-centos8-source-masakari:
-            files: ^docker/(base|masakari)/
-        - kolla-ansible-centos8-source-ovn:
-            files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
-        - kolla-ansible-centos8-source-prometheus-efk:
-            files: ^docker/(base|elasticsearch|grafana|kibana|prometheus)/
-        - kolla-ansible-centos8-source-kvm:
-            files: ^docker/nova/
         - kolla-ansible-centos8s-source-bifrost:
             files: ^docker\/(base|bifrost|openstack-base)\/.*
         # Test rabbitmq & mariadb changes in multinode ceph jobs.
@@ -97,15 +56,6 @@
         - kolla-ansible-centos8s-source-kvm:
             files: ^docker/nova/
 
-- job:
-    name: kolla-build-centos8-binary
-    parent: kolla-base
-    nodeset: kolla-centos8
-    voting: false
-    vars:
-      base_distro: centos
-      install_type: binary
-
 - job:
     name: kolla-build-centos8s-binary
     parent: kolla-base
@@ -117,17 +67,6 @@
       base_tag: stream8
       install_type: binary
 
-- job:
-    name: kolla-publish-centos8-binary-dockerhub
-    parent: kolla-build-centos8-binary
-    post-run: tests/playbooks/publish.yml
-    vars:
-      publisher: true
-      kolla_registry: dockerhub
-      kolla_namespace: kolla
-    secrets:
-      - kolla_dockerhub_creds
-
 - job:
     name: kolla-publish-centos8s-binary-dockerhub
     parent: kolla-build-centos8s-binary
@@ -139,17 +78,6 @@
     secrets:
       - kolla_dockerhub_creds
 
-- job:
-    name: kolla-publish-centos8-binary-quay
-    parent: kolla-build-centos8-binary
-    post-run: tests/playbooks/publish.yml
-    vars:
-      publisher: true
-      kolla_registry: quay.io
-      kolla_namespace: openstack.kolla
-    secrets:
-      - kolla_quay_io_creds
-
 - job:
     name: kolla-publish-centos8s-binary-quay
     parent: kolla-build-centos8s-binary
@@ -161,14 +89,6 @@
     secrets:
       - kolla_quay_io_creds
 
-- job:
-    name: kolla-build-centos8-source
-    parent: kolla-base
-    nodeset: kolla-centos8
-    vars:
-      base_distro: centos
-      install_type: source
-
 - job:
     name: kolla-build-centos8s-source
     parent: kolla-base
@@ -179,29 +99,12 @@
       base_tag: stream8
       install_type: source
 
-- job:
-    name: kolla-build-centos8-source-aarch64
-    parent: kolla-build-centos8-source
-    nodeset: kolla-centos8-aarch64
-    voting: false
-
 - job:
     name: kolla-build-centos8s-source-aarch64
     parent: kolla-build-centos8s-source
     nodeset: kolla-centos8-stream-aarch64
     voting: false
 
-- job:
-    name: kolla-publish-centos8-source-dockerhub
-    parent: kolla-build-centos8-source
-    post-run: tests/playbooks/publish.yml
-    vars:
-      publisher: true
-      kolla_registry: dockerhub
-      kolla_namespace: kolla
-    secrets:
-      - kolla_dockerhub_creds
-
 - job:
     name: kolla-publish-centos8s-source-dockerhub
     parent: kolla-build-centos8s-source
@@ -213,17 +116,6 @@
     secrets:
       - kolla_dockerhub_creds
 
-- job:
-    name: kolla-publish-centos8-source-quay
-    parent: kolla-build-centos8-source
-    post-run: tests/playbooks/publish.yml
-    vars:
-      publisher: true
-      kolla_registry: quay.io
-      kolla_namespace: openstack.kolla
-    secrets:
-      - kolla_quay_io_creds
-
 - job:
     name: kolla-publish-centos8s-source-quay
     parent: kolla-build-centos8s-source
@@ -234,11 +126,3 @@
       kolla_namespace: openstack.kolla
     secrets:
       - kolla_quay_io_creds
-
-- job:
-    name: kolla-build-no-infra-wheels-centos8-source
-    parent: kolla-build-no-infra-wheels-base
-    nodeset: kolla-centos8
-    vars:
-      base_distro: centos
-      install_type: source
diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst
@@ -78,14 +78,6 @@ See the :ref:`support matrix <support-matrix-base-images>` for information on
 supported base image distribution versions and supported images on each
 distribution.
 
-The Victoria release supports both CentOS 8 Linux and CentOS 8 Stream base
-container images. The default is to use CentOS 8 Linux. CentOS 8 Stream
-may be used as follows:
-
-.. code-block:: console
-
-   kolla-build --base centos --base-image quay.io/centos/centos --base-tag stream8
-
 It is possible to build only a subset of images by specifying them on the
 command line:
 

diff --git a/doc/source/support_matrix.rst b/doc/source/support_matrix.rst
@@ -19,10 +19,14 @@ The following base container images are supported:
    CentOS 7 is no longer supported as a base container image. The Train release
    supports both CentOS 7 and 8 images, and provides a route for migration.
 
+.. note::
+
+   CentOS 8 is no longer supported since it has been marked as End of Life
+   and repositories have been removed from CentOS mirrors.
+
 =============== ============ =============================== ================
 Distribution    Default base Default base image              Default base tag
 =============== ============ =============================== ================
-CentOS 8 Linux  centos       centos                          8
 CentOS 8 Stream centos       quay.io/centos/centos           stream8
 Debian Buster   debian       debian                          10
 RHEL 8          rhel         rhel                            8

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
@@ -92,12 +92,14 @@ COPY dnf.conf /etc/dnf/dnf.conf
 {% elif base_arch == 'aarch64' %}
     {% set base_yum_repo_files = [
         'elasticsearch.repo',
+        'erlang-solutions.repo',
         'grafana.repo',
         'rabbitmq_rabbitmq-server.repo',
         'td.repo',
     ] %}
 
     {% set base_yum_repo_keys = [
+        'https://packages.erlang-solutions.com/rpm/erlang_solutions.asc',
         'https://packages.grafana.com/gpg.key',
         'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
     ] %}
@@ -213,6 +215,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
     'centos-ceph-nautilus',
     'centos-opstools',
     'centos-rabbitmq-38',
+    'epel',
+    'epel-modular',
 ] %}
 
 {% if base_arch == 'x86_64' %}
@@ -361,17 +365,18 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
       'F77F1EDA57EBB1CC',
       'F6609E60DC62814E',
     ] %}
-    {% set remote_apt_keys = [
+    {% set base_remote_apt_keys = [
       'https://packages.grafana.com/gpg.key',
       'https://repos.influxdata.com/influxdb.key',
     ] %}
 {% elif base_distro == 'debian' %}
     {% set base_apt_keys = [
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
+      'F1656F24C74CD1D8',
       'F77F1EDA57EBB1CC',
       'F6609E60DC62814E',
     ] %}
-    {% set remote_apt_keys = [
+    {% set base_remote_apt_keys = [
       'https://download.docker.com/linux/debian/gpg',
       'https://packages.grafana.com/gpg.key',
       'http://buster-ussuri.debian.net/debian/dists/pubkey.gpg',
@@ -391,7 +396,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
             {%- if not loop.last %} \
             {% endif -%}
         {% endfor %}
-        {% for key in remote_apt_keys | customizable('remote_apt_keys') %}
+        {% for key in base_remote_apt_keys | customizable('remote_apt_keys') %}
             {%- if loop.first %} RUN {% else %} && {% endif %}curl {{ key }} | apt-key add -
             {%- if not loop.last %} \
             {% endif -%}

diff --git a/docker/base/erlang-solutions.repo b/docker/base/erlang-solutions.repo
@@ -0,0 +1,6 @@
+[erlang-solutions]
+name=erlang-solutions
+baseurl=https://packages.erlang-solutions.com/rpm/centos/$releasever/$basearch
+gpgcheck=1
+gpgkey=https://packages.erlang-solutions.com/rpm/erlang_solutions.asc
+enabled=0
diff --git a/docker/base/set_configs.py b/docker/base/set_configs.py
@@ -20,6 +20,7 @@
 import os
 import pwd
 import shutil
+import stat
 import sys
 
 
@@ -369,6 +370,15 @@ def set_perms(path, uid, gid, perm):
                     perm = ''.join([perm[:1], 'o', perm[1:]])
                 perm = int(perm, base=0)
 
+                # Ensure execute bit on directory if read bit is set
+                if os.path.isdir(path):
+                    if perm & stat.S_IRUSR:
+                        perm |= stat.S_IXUSR
+                    if perm & stat.S_IRGRP:
+                        perm |= stat.S_IXGRP
+                    if perm & stat.S_IROTH:
+                        perm |= stat.S_IXOTH
+
                 try:
                     os.chmod(path, perm)
                 except OSError:

diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -23,7 +23,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% elif base_package_type == 'deb' %}
     {% set cinder_volume_packages = [
+            'lsscsi',
             'nfs-common',
+            'nvme-cli',
             'sysfsutils',
             'python3-rtslib-fb',
             'targetcli-fb',