Merge pull request #140 from stackhpc/upstream/wallaby-2022-06-13

Synchronise wallaby with upstream

Author: markgoddard

.zuul.d/base.yaml

@@ -113,7 +113,6 @@
     extra-vars:
       kolla_logs_dir: "{{ zuul_output_dir }}/logs/kolla"
       kolla_build_logs_dir: "{{ kolla_logs_dir }}/build"
-      kolla_work_dir: "{{ kolla_logs_dir }}"
       virtualenv_path: "/tmp/kolla-virtualenv"
 
 - job:

docker/base/Dockerfile.j2

@@ -358,8 +358,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
     {# 901F9177AB97ACBE                         -- Treasure Data, Inc (Treasure Agent Official Signing key) <[email protected]> #}
     {# A20F259AEB9C94BB                         -- Sensuapp (Freight) <[email protected]> #}
     {# F1656F24C74CD1D8                         -- MariaDB Signing Key <[email protected]> #}
-    {# F77F1EDA57EBB1CC                         -- Launchpad RabbitMQ Erlang PPA key #}
-    {# F6609E60DC62814E                         -- PackageCloud RabbitMQ repository key #}
+    {# E495BB49CC4BBE5B                         -- Cloudsmith RabbitMQ Erlang repository key #}
+    {# 9F4587F226208342                         -- Cloudsmith RabbitMQ repository key #}
     {% set base_apt_keys = [
       '391A9AA2147192839E9DB0315EDB1B62EC4926EA',
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
@@ -369,8 +369,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
       '901F9177AB97ACBE',
       'A20F259AEB9C94BB',
       'F1656F24C74CD1D8',
-      'F77F1EDA57EBB1CC',
-      'F6609E60DC62814E',
+      'E495BB49CC4BBE5B',
+      '9F4587F226208342',
     ] %}
     {% set base_remote_apt_keys = [
       'https://packages.grafana.com/gpg.key',
@@ -380,8 +380,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
     {% set base_apt_keys = [
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
       'F1656F24C74CD1D8',
-      'F77F1EDA57EBB1CC',
-      'F6609E60DC62814E',
+      'E495BB49CC4BBE5B',
+      '9F4587F226208342',
     ] %}
     {% set base_remote_apt_keys = [
       'https://download.docker.com/linux/debian/gpg',

docker/base/healthcheck_curl

@@ -5,7 +5,7 @@
 : ${HEALTHCHECK_CURL_OUTPUT:='/dev/null'}
 
 export NSS_SDB_USE_CACHE=no
-curl -g -k -q -s -S --fail -o "${HEALTHCHECK_CURL_OUTPUT}" \
+curl -q -g -k -s -S --fail -o "${HEALTHCHECK_CURL_OUTPUT}" \
     --max-time "${HEALTHCHECK_CURL_MAX_TIME}" \
     --user-agent "${HEALTHCHECK_CURL_USER_AGENT}" \
     --write-out "${HEALTHCHECK_CURL_WRITE_OUT}" \

docker/base/set_configs.py

@@ -120,6 +120,7 @@ def _set_properties(self, source, dest):
             self._set_properties_from_conf(dest)
 
     def _set_properties_from_file(self, source, dest):
+        LOG.info('Copying permissions from %s onto %s', source, dest)
         shutil.copystat(source, dest)
         stat = os.stat(source)
         os.chown(dest, stat.st_uid, stat.st_gid)

docker/bifrost/bifrost-base/Dockerfile.j2

@@ -51,6 +51,11 @@ RUN echo " " && \
 {%- endif %}
     bash -c './scripts/env-setup.sh && \
     ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \
+{%- if base_distro == 'centos' %}
+{# NOTE(mmalchuk): since DIB drop Python3.6 support we need to build DIB from #}
+{# the latest supported stable tag until we move to CentOS9 #}
+    -e dib_git_branch="3.21.1" \
+{%- endif %}
     -e @/tmp/build_arg.yml && \
 {%- if base_package_type == 'deb' %}
     apt-get clean && rm -rf /var/lib/apt/lists/*'

docker/cloudkitty/cloudkitty-api/Dockerfile.j2

@@ -13,8 +13,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         {% set cloudkitty_api_packages = [
                 'openstack-cloudkitty-api'
         ] %}
-{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }}
-
     {% elif base_package_type == 'deb' %}
 
         {% set cloudkitty_api_packages = [
@@ -23,12 +21,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
     {% endif %}
 {% elif install_type == 'source' %}
-
         {% set cloudkitty_api_packages = [
         ] %}
-{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }}
 {% endif %}
 
+{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }}
+
 COPY extend_start.sh /usr/local/bin/kolla_cloudkitty_extend_start
 RUN chmod 755 /usr/local/bin/kolla_cloudkitty_extend_start
 

docker/elasticsearch/elasticsearch/Dockerfile.j2

@@ -12,8 +12,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['elasticsearch']) }}
 
 {% if base_package_type == 'rpm' %}
+
+# NOTE(hrw): post-install script of elasticsearch fails when trying to
+# install elasticsearch and java together.
+{{ macros.install_packages(['java-11-openjdk-headless']) }}
+
     {% set elasticsearch_packages = [
-        'java-11-openjdk-headless',
         'elasticsearch-oss',
     ] %}
 

docker/macros.j2

@@ -34,7 +34,7 @@
 
 {% macro install_pip(packages, constraints = true) %}
 {%- if packages is sequence and packages|length > 0 -%}
-    python{{ distro_python_version }} -m pip --no-cache-dir install --upgrade{{ ' ' }}
+    SETUPTOOLS_USE_DISTUTILS=stdlib python{{ distro_python_version }} -m pip --no-cache-dir install --upgrade{{ ' ' }}
     {%- if constraints %}-c /requirements/upper-constraints.txt {% endif -%}
     {{ packages | join(' ') }}
 {%- else -%}

docker/masakari/masakari-monitors/Dockerfile.j2

@@ -20,10 +20,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% elif base_package_type == 'deb' %}
 
         {% set masakari_base_packages = [
+            'libsasl2-modules-gssapi-mit',
             'masakari-host-monitor',
             'masakari-instance-monitor',
             'masakari-introspective-instance-monitor',
             'masakari-process-monitor',
+            'sasl2-bin',
         ] %}
 
     {% endif %}
@@ -35,16 +37,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% if base_package_type == 'rpm' %}
 
         {% set masakari_monitors_packages = [
-            'libvirt-devel',
+            'cyrus-sasl-md5',
+            'cyrus-sasl-scram',
+            'python3-libvirt',
             'pacemaker-cli',
             'tcpdump',
         ] %}
 
     {% elif base_package_type == 'deb' %}
 
         {% set masakari_monitors_packages = [
-            'libvirt-dev',
+            'libsasl2-modules-gssapi-mit',
+            'python3-libvirt',
             'pacemaker-cli-utils',
+            'sasl2-bin',
             'tcpdump',
         ] %}
 
@@ -58,7 +64,9 @@ ADD masakari-monitors-archive /masakari-monitors-source
     '/masakari-monitors'
 ] %}
 
+# NOTE(hrw): distros may provide other version of libvirt
 RUN ln -s masakari-monitors-source/* masakari-monitors \
+    && sed -i -e "/^libvirt-python/d" /requirements/upper-constraints.txt \
     && {{ macros.install_pip(masakari_monitors_pip_packages | customizable("pip_packages")) }} \
     && mkdir -p /etc/masakari-monitors \
     && chown -R masakari: /etc/masakari-monitors

kolla/common/config.py

@@ -247,7 +247,9 @@
     cfg.BoolOpt('summary', default=True,
                 help='Show summary at the end of build'),
     cfg.BoolOpt('infra-rename', default=False,
-                help='Rename infrastructure images to infra')
+                help='Rename infrastructure images to infra'),
+    cfg.StrOpt('repos-yaml', default='',
+               help='Path to alternative repos.yaml file'),
 ]
 
 _BASE_OPTS = [