Sync upstream stable/victoria

.zuul.d/base.yaml

@@ -57,6 +57,12 @@
       - name: primary
         label: centos-8
 
+- nodeset:
+    name: kolla-centos8-stream
+    nodes:
+      - name: primary
+        label: centos-8-stream
+
 - nodeset:
     name: kolla-ubuntu-focal
     nodes:
@@ -75,6 +81,12 @@
       - name: primary
         label: centos-8-arm64
 
+- nodeset:
+    name: kolla-centos8-stream-aarch64
+    nodes:
+      - name: primary
+        label: centos-8-stream-arm64
+
 - nodeset:
     name: kolla-debian-buster-aarch64
     nodes:
@@ -110,7 +122,6 @@
       - ^tox\.ini$
     vars:
       publisher: false
-      ansible_python_interpreter: python3
     extra-vars:
       kolla_logs_dir: "{{ zuul_output_dir }}/logs/kolla"
       kolla_build_logs_dir: "{{ kolla_logs_dir }}/build"

.zuul.d/centos.yaml

@@ -4,30 +4,40 @@
       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
     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
     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
@@ -66,6 +76,17 @@
       base_distro: centos
       install_type: binary
 
+- job:
+    name: kolla-build-centos8s-binary
+    parent: kolla-base
+    nodeset: kolla-centos8-stream
+    voting: false
+    vars:
+      base_distro: centos
+      base_image: quay.io/centos/centos
+      base_tag: stream8
+      install_type: binary
+
 - job:
     name: kolla-publish-centos8-binary-dockerhub
     parent: kolla-build-centos8-binary
@@ -77,6 +98,17 @@
     secrets:
       - kolla_dockerhub_creds
 
+- job:
+    name: kolla-publish-centos8s-binary-dockerhub
+    parent: kolla-build-centos8s-binary
+    post-run: tests/playbooks/publish.yml
+    vars:
+      publisher: true
+      kolla_registry: dockerhub
+      kolla_namespace: kolla
+    secrets:
+      - kolla_dockerhub_creds
+
 - job:
     name: kolla-publish-centos8-binary-quay
     parent: kolla-build-centos8-binary
@@ -88,6 +120,17 @@
     secrets:
       - kolla_quay_io_creds
 
+- job:
+    name: kolla-publish-centos8s-binary-quay
+    parent: kolla-build-centos8s-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-build-centos8-source
     parent: kolla-base
@@ -96,12 +139,28 @@
       base_distro: centos
       install_type: source
 
+- job:
+    name: kolla-build-centos8s-source
+    parent: kolla-base
+    nodeset: kolla-centos8-stream
+    vars:
+      base_distro: centos
+      base_image: quay.io/centos/centos
+      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
@@ -113,6 +172,17 @@
     secrets:
       - kolla_dockerhub_creds
 
+- job:
+    name: kolla-publish-centos8s-source-dockerhub
+    parent: kolla-build-centos8s-source
+    post-run: tests/playbooks/publish.yml
+    vars:
+      publisher: true
+      kolla_registry: dockerhub
+      kolla_namespace: kolla
+    secrets:
+      - kolla_dockerhub_creds
+
 - job:
     name: kolla-publish-centos8-source-quay
     parent: kolla-build-centos8-source
@@ -124,6 +194,17 @@
     secrets:
       - kolla_quay_io_creds
 
+- job:
+    name: kolla-publish-centos8s-source-quay
+    parent: kolla-build-centos8s-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-build-no-infra-wheels-centos8-source
     parent: kolla-build-no-infra-wheels-base

doc/source/admin/image-building.rst

@@ -78,6 +78,14 @@ 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:
 

doc/source/support_matrix.rst

@@ -19,14 +19,15 @@ 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.
 
-============= ============ ================
-Distribution  Default base Default base tag
-============= ============ ================
-CentOS 8      centos       8
-Debian Buster debian       10
-RHEL 8        rhel         8
-Ubuntu Focal  ubuntu       20.04
-============= ============ ================
+=============== ============ =============================== ================
+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
+Ubuntu Focal    ubuntu       ubuntu                          20.04
+=============== ============ =============================== ================
 
 The remainder of this document outlines which images are supported on which of
 these distribution.

docker/base/Dockerfile.j2

@@ -146,7 +146,10 @@ RUN if [[ -e /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo ]]; then \
     'glibc-all-langpacks'
 ] %}
 
-RUN {{ macros.install_packages(base_centos_language_packages | customizable("centos_language_packages"), chain=True, clean=False) }} \
+# NOTE(hrw): this macro file drops all languages other than C.UTF-8 so horizon fails
+# https://bugzilla.redhat.com/show_bug.cgi?id=1729770
+RUN rm -f /etc/rpm/macros.image-language-conf \
+    && {{ macros.install_packages(base_centos_language_packages | customizable("centos_language_packages"), chain=True, clean=False) }} \
     && {{ macros.rpm_security_update(clean_package_cache) }}
 
 {% endblock %}
@@ -248,7 +251,9 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen
 {% set base_centos_packages = [
         'ca-certificates',
         'curl',
+        'dumb-init',
         'findutils',
+        'hostname',
         'iproute',
         'iscsi-initiator-utils',
         'lvm2',
@@ -319,6 +324,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 {% set base_apt_packages = [
    'apt-utils',
    'curl',
+   'dumb-init',
    'gawk',
    'iproute2',
    'kmod',
@@ -330,8 +336,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
    'python3-pip',
    'socat',
    'sudo',
-   'tgt']
-%}
+   'tgt'
+] %}
 
 {% if base_distro == 'ubuntu' %}
     {# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #}
@@ -416,16 +422,7 @@ COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup
 COPY sudoers /etc/sudoers
 
 {% if use_dumb_init %}
-
-{% block dumb_init_installation %}
-
-RUN curl -sSL https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_{{debian_arch}} -o /usr/local/bin/dumb-init \
-    && chmod +x /usr/local/bin/dumb-init
-
-{% endblock %}
-
 ENTRYPOINT ["dumb-init", "--single-child", "--"]
-
 {% endif %}
 
 {% if docker_healthchecks %}

docker/glance/glance-base/Dockerfile.j2

@@ -15,13 +15,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% if base_package_type == 'rpm' %}
         {% set glance_base_packages = [
             'openstack-glance',
+            'python3-boto3',
             'python3-oslo-vmware',
             'python3-rados',
             'python3-rbd'
         ] %}
     {% elif base_package_type == 'deb' %}
         {% set glance_base_packages = [
             'glance',
+            'python3-boto3',
             'python3-os-brick',
             'python3-oslo.vmware',
             'python3-rados',
@@ -55,7 +57,7 @@ ADD glance-base-archive /glance-base-source
 
 {% set glance_base_pip_packages = [
     '/glance',
-    'glance_store[cinder,vmware,swift]'
+    'glance_store[cinder,vmware,swift,s3]'
 ] %}
 
 # add missing rootwrap config present in glance_store repo

docker/gnocchi/gnocchi-base/Dockerfile.j2

@@ -50,6 +50,7 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages
 
        {% set gnocchi_base_packages = [
             'librados2-devel',
+            'python3-rados',
         ] %}
 
 {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
@@ -58,6 +59,7 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi
 
        {% set gnocchi_base_packages = [
             'librados-dev',
+            'python3-rados',
         ] %}
 
 {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}

docker/kolla-toolbox/Dockerfile.j2

@@ -72,10 +72,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'virtualenv'
     ] %}
 
+{% block kolla_toolbox_upper_constraints %}
 RUN mkdir -p /requirements \
     && curl -sSL -o /requirements/upper-constraints.txt https://releases.openstack.org/constraints/upper/{{ openstack_release }} \
     && {{ macros.install_pip(kolla_toolbox_pip_virtualenv_packages | customizable("pip_virtualenv_packages")) }} \
     && virtualenv --system-site-packages {{ virtualenv_path }}
+{% endblock %}
 
 ENV PATH {{ virtualenv_path }}/bin:$PATH
 

docker/monasca/monasca-grafana/Dockerfile.j2

@@ -62,6 +62,7 @@ RUN gem install fpm \
     && tar --strip 1 -xvf /tmp/monasca-grafana.tgz -C ${monasca_grafana_build_path} \
     && rm -f /tmp/monasca-grafana.tgz \
     && cd ${monasca_grafana_build_path} \
+    && export GO111MODULE=auto \
     && go run build.go setup \
     && npm config set prefix /usr/local -g \
     && npm install npm@6.x -g \

docker/monasca/monasca-thresh/Dockerfile.j2

@@ -66,8 +66,14 @@ RUN cd /monasca-common-source/java \
 
 # Overwrite the script inherited from Storm
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+# Add bootstrap script
+COPY topology_bootstrap.sh /usr/local/bin/topology_bootstrap
+
 RUN touch /usr/local/bin/kolla_monasca_extend_start \
-    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_monasca_extend_start
+    && chmod 755 /usr/local/bin/kolla_extend_start \
+    /usr/local/bin/kolla_monasca_extend_start \
+    /usr/local/bin/topology_bootstrap
 
 {% block monasca_thresh_footer %}{% endblock %}
 {% block footer %}{% endblock %}

docker/monasca/monasca-thresh/extend_start.sh

@@ -42,3 +42,9 @@ if [[ $(ls -Ab ${MONASCA_WORKER_DIR}) != "" ]]; then
 fi
 
 . /usr/local/bin/kolla_monasca_extend_start
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    . /usr/local/bin/topology_bootstrap
+fi