Merge pull request #142 from stackhpc/upstream/xena-2022-06-13

Synchronise xena 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:

.zuul.d/debian.yaml

@@ -20,6 +20,8 @@
     experimental:
       jobs:
         - kolla-build-no-infra-wheels-debian-source
+        - kolla-ansible-debian-source-ironic:
+            files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
 
 - job:
     name: kolla-build-debian-source

docker/base/Dockerfile.j2

@@ -322,8 +322,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 ] %}
 
 {% set base_apt_keys = [
-   {'name': 'erlang',   'keyid': 'F77F1EDA57EBB1CC'},
-   {'name': 'rabbitmq', 'keyid': 'F6609E60DC62814E'},
+   {'name': 'erlang',   'keyid': 'E495BB49CC4BBE5B'},
+   {'name': 'rabbitmq', 'keyid': '9F4587F226208342'},
    {'name': 'haproxy',  'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'},
 ] %}
 

docker/base/apt_preferences.debian

@@ -22,3 +22,8 @@ Pin-Priority: -1000
 Package: openvswitch* python3-openvswitch ovn-*
 Pin: release n=bullseye-backports
 Pin-Priority: 1024
+
+# NOTE(hrw): Debian OpenStack Team repo has some backports we do not want
+Package: git*
+Pin: release n=bullseye
+Pin-Priority: 1024

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

@@ -40,8 +40,13 @@ RUN apt-get update && \
 {%- else %}
 RUN echo " " && \
 {%- endif %}
-    bash -c './scripts/env-setup.sh && \
+    bash -c 'TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt ./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 -%}
-    python3 -m pip --no-cache-dir install --upgrade{{ ' ' }}
+    SETUPTOOLS_USE_DISTUTILS=stdlib python3 -m pip --no-cache-dir install --upgrade{{ ' ' }}
     {%- if constraints %}-c /requirements/upper-constraints.txt {% endif -%}
     {{ packages | join(' ') }}
 {%- else -%}