Merge pull request #72 from openstack/stable/victoria

Sync stable/victoria

Author: cityofships

.zuul.d/base.yaml

@@ -25,6 +25,32 @@
           Oz6nUZlML6sEyT0vilbDpo1RRweinE5J8mU+8joxeDpCHXBUYekFmgXDlpg58XmSp96fM
           C/rWcxTKlGJjjlVFZfhRHHy6gWBYH/SoozkbpkWbk0g43SLSxAuITy7nqLggOU=
 
+- secret:
+    name: kolla_quay_io_creds
+    data:
+      username: !encrypted/pkcs1-oaep
+        - VsvMvV5wOUfl5B2HJboWfN8mta/Tuk7PXcJf5RfKk4uXP6qYGM4dcMB9EdoJNhMCi7FeA
+          NrTZaxf/AjLAkgKlRhz7sPKhmR95+jrFRgEzedpcCamdPkCa+wNQEMNMd0rTwioYUEWm4
+          Y+Oa2mIswy5LcUViz38MPQhf0725U5sYtH2qkuhMbU8u8vzYhSk749xtAN6I1T8ziTKKB
+          3FBowFc2rSRJUQPsLLZjTxBHbrk+00p/DPoHLOz9/9Jf5U//jkqx4ziE2w1a4+x/kWlYT
+          BPXuRL9wWN9ci2uKuoDRRd6QHJzPIJerKG07YU4PAcS3M245rbjjUQC3n3SQJs3u4kKI8
+          rZrxfbmtbfjkzRQXnhnhPk47PebpjnpEUNw6+scnQ+ELdQ0QYGsVRM4x4/ywe5CeFYVDR
+          whQQ1iG21FOs3iv592I7P7l4cEKqKFyx9qiV4t2fyLrHgtU+L/05iENH9igGJ0tDCQ5zT
+          2F2laUWGtzUh76txuFDjpBxR3qS62g825dZXaTegkA+v6c1az23lrYTqbTRf63cuAQyYX
+          APPRC5QU0URXBoIbWb0ry3O5lr/uudI1ZCLN8SSJhpmZAIlviOfaxrKu9fg2YY9e0xpz9
+          CMEWQ/n1EsUyL34Wv189Rvpq4M4GTvozEKsRsjY3u0ygwEUXcH2lEXGOrs+hms=
+      password: !encrypted/pkcs1-oaep
+        - dR2beX9Bn7O8iCqNHtWo1FWX71vy+CwffDk5rafUh5yew2OVNcVtVjVOPvHwb5zZv1LCd
+          MVcgIJe513dM5tQkn2H/HvN/seVu/CfHA6lg6Tj+ueW9VdUH6KiBPr+NCgQWX+Xt3sXbt
+          sPzfNGpvTw1ZCUp0nnudZEKPZ2jn83baNMumW8E8xPb4s2kePzINsb8sGvqy6BOk5rUIo
+          7DaEwWrNnq9TTnMcWGIF+fLP5Pin7+fmvnLkT6qRN4v5FszpHYm8YCpv02nzqI1/F9HeM
+          P3GtkUdIPxa1+3VwZ/DSA9BWi4VG15jDtaxeZFVGQuMqQAiCx8Jqvd+xX2qugAq1m+U7W
+          JobDbaeTYrUmJ1zUaspPZ16RTSf9UGCTaejoSVKM9lJHv6ixtsX7UWkgFvceVrlkt7TtH
+          2mqhBnXvwB6VD5d311WRUfNXz7gb60otisB5G2k/UnRnv1Mu33TPVT7XOFDpVnAvRS3lt
+          haJ34N7AWnDIsllvzcmVWTw3wf/6LLfOQrW2Z+vNambyR4Oc+LVUTbEvZVIU65LpOTIn3
+          LfDhCLDD3VtnVOrj4UxZsjzmPbday1fziua/7f+CXsShC5erz0ZM65rMCwkjWeI6Kc63A
+          0M27tl+OWHO3KkfFR4tWc3dws3r1kYjQeds0adBHyYD0eL8SJfwZkbtojAQ1JM=
+
 - nodeset:
     name: kolla-centos8
     nodes:

.zuul.d/centos.yaml

@@ -16,14 +16,18 @@
         - kolla-build-centos8-source
         - kolla-ansible-centos8-source
         - kolla-ansible-centos8-source-upgrade
+    periodic:
+      jobs:
+        - kolla-publish-centos8-source-quay
+        - kolla-publish-centos8-binary-quay
     periodic-weekly:
       jobs:
-        - kolla-publish-centos8-source
-        - kolla-publish-centos8-binary
+        - kolla-publish-centos8-source-dockerhub
+        - kolla-publish-centos8-binary-dockerhub
     release:
       jobs:
-        - kolla-publish-centos8-source
-        - kolla-publish-centos8-binary
+        - kolla-publish-centos8-source-dockerhub
+        - kolla-publish-centos8-binary-dockerhub
     experimental:
       jobs:
         - kolla-build-no-infra-wheels-centos8-source
@@ -63,14 +67,27 @@
       install_type: binary
 
 - job:
-    name: kolla-publish-centos8-binary
+    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-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-build-centos8-source
     parent: kolla-base
@@ -86,14 +103,27 @@
     voting: false
 
 - job:
-    name: kolla-publish-centos8-source
+    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-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-build-no-infra-wheels-centos8-source
     parent: kolla-build-no-infra-wheels-base

.zuul.d/debian.yaml

@@ -9,15 +9,19 @@
       jobs:
         - kolla-build-debian-source-aarch64
         - kolla-ansible-debian-source-aarch64
+    periodic:
+      jobs:
+        - kolla-publish-debian-source-quay
+        - kolla-publish-debian-source-aarch64-quay
     periodic-weekly:
       jobs:
-        - kolla-publish-debian-source
-        - kolla-publish-debian-source-aarch64
+        - kolla-publish-debian-source-dockerhub
+        - kolla-publish-debian-source-aarch64-dockerhub
     release:
       jobs:
-        - kolla-publish-debian-source
-        - kolla-publish-debian-source-aarch64
-        - kolla-publish-debian-binary
+        - kolla-publish-debian-source-dockerhub
+        - kolla-publish-debian-source-aarch64-dockerhub
+        - kolla-publish-debian-binary-dockerhub
     experimental:
       jobs:
         - kolla-build-no-infra-wheels-debian-source
@@ -46,27 +50,70 @@
       install_type: binary
 
 - job:
-    name: kolla-publish-debian-binary
+    name: kolla-publish-debian-binary-dockerhub
     parent: kolla-build-debian-binary
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
+      kolla_registry: dockerhub
+      kolla_namespace: kolla
     secrets:
       - kolla_dockerhub_creds
 
 - job:
-    name: kolla-publish-debian-source
+    name: kolla-publish-debian-binary-quay
+    parent: kolla-build-debian-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-debian-source-dockerhub
     parent: kolla-build-debian-source
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
+      kolla_registry: dockerhub
+      kolla_namespace: kolla
     secrets:
       - kolla_dockerhub_creds
 
 - job:
-    name: kolla-publish-debian-source-aarch64
-    parent: kolla-publish-debian-source
-    nodeset: kolla-debian-buster-aarch64
+    name: kolla-publish-debian-source-quay
+    parent: kolla-build-debian-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-debian-source-aarch64-dockerhub
+    parent: kolla-build-debian-source-aarch64
+    post-run: tests/playbooks/publish.yml
+    vars:
+      publisher: true
+      kolla_registry: dockerhub
+      kolla_namespace: kolla
+    secrets:
+      - kolla_dockerhub_creds
+
+- job:
+    name: kolla-publish-debian-source-aarch64-quay
+    parent: kolla-build-debian-source-aarch64
+    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-debian-source

.zuul.d/ubuntu.yaml

@@ -26,14 +26,18 @@
         - kolla-ansible-ubuntu-source-upgrade:
             vars:
               kolla_python_version: 3.8
+    periodic:
+      jobs:
+        - kolla-publish-ubuntu-source-quay
+        - kolla-publish-ubuntu-binary-quay
     periodic-weekly:
       jobs:
-        - kolla-publish-ubuntu-source
-        - kolla-publish-ubuntu-binary
+        - kolla-publish-ubuntu-source-dockerhub
+        - kolla-publish-ubuntu-binary-dockerhub
     release:
       jobs:
-        - kolla-publish-ubuntu-source
-        - kolla-publish-ubuntu-binary
+        - kolla-publish-ubuntu-source-dockerhub
+        - kolla-publish-ubuntu-binary-dockerhub
     experimental:
       jobs:
         - kolla-build-no-infra-wheels-ubuntu-source
@@ -93,14 +97,27 @@
       install_type: binary
 
 - job:
-    name: kolla-publish-ubuntu-binary
+    name: kolla-publish-ubuntu-binary-dockerhub
     parent: kolla-build-ubuntu-binary
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
+      kolla_registry: dockerhub
+      kolla_namespace: kolla
     secrets:
       - kolla_dockerhub_creds
 
+- job:
+    name: kolla-publish-ubuntu-binary-quay
+    parent: kolla-build-ubuntu-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-ubuntu-source
     parent: kolla-base
@@ -116,14 +133,27 @@
     voting: false
 
 - job:
-    name: kolla-publish-ubuntu-source
+    name: kolla-publish-ubuntu-source-dockerhub
     parent: kolla-build-ubuntu-source
     post-run: tests/playbooks/publish.yml
     vars:
       publisher: true
+      kolla_registry: dockerhub
+      kolla_namespace: kolla
     secrets:
       - kolla_dockerhub_creds
 
+- job:
+    name: kolla-publish-ubuntu-source-quay
+    parent: kolla-build-ubuntu-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-ubuntu-source
     parent: kolla-build-no-infra-wheels-base

docker/base/Dockerfile.j2

@@ -3,6 +3,9 @@ FROM {{ base_image }}:{{ base_distro_tag }}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}
 
+# We use curl in this dockerfile so let configure it before first use
+COPY curlrc /root/.curlrc
+
 {% block base_lang %}
 # NOTE(yoctozepto): use a UTF-8 (Unicode) locale like standard image installs do
 # fixes issues arising from ascii fallback usage
@@ -418,7 +421,6 @@ COPY start.sh /usr/local/bin/kolla_start
 COPY copy_cacerts.sh /usr/local/bin/kolla_copy_cacerts
 COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup
 COPY sudoers /etc/sudoers
-COPY curlrc /root/.curlrc
 
 {% if use_dumb_init %}
 

docker/base/apt_preferences.debian

@@ -12,9 +12,9 @@ Package: rabbitmq-server
 Pin: version 3.8.*
 Pin-Priority: 1000
 
-# We need erlang 22 for rabbitmq
+# We need erlang 22+ for rabbitmq (aarch64 has v23, x86-64 has v22 and v23 so we use v23)
 Package: erlang*
-Pin: version 1:22.*
+Pin: version 1:23.*
 Pin-Priority: 1000
 
 # We do not want packages from this repo
@@ -44,10 +44,10 @@ Pin-Priority: 700
 
 # we want newer QEMU
 Package: qemu*
-Pin: version 1:5.0*
+Pin: version 1:5.*
 Pin-Priority: 700
 
 # QEMU depends on those
-Package: libpmem1 libndctl6 libdaxctl1 pmdk-tools libpmemblk1 libpmemlog1 libpmemobj1 libpmempool1
+Package: libpmem1 libndctl6 libdaxctl1 pmdk-tools libpmemblk1 libpmemlog1 libpmemobj1 libpmempool1 liburing1 libfdt1
 Pin: release n=buster-backports
 Pin-Priority: 700

docker/base/set_configs.py

@@ -164,7 +164,7 @@ def _cmp_file(self, source, dest):
                 not os.path.exists(dest)):
             return False
         # check content
-        with open(source) as f1, open(dest) as f2:
+        with open(source, 'rb') as f1, open(dest, 'rb') as f2:
             if f1.read() != f2.read():
                 LOG.error('The content of source file(%s) and'
                           ' dest file(%s) are not equal.', source, dest)

docker/octavia/octavia-driver-agent/Dockerfile.j2

@@ -0,0 +1,41 @@
+FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
+
+{% block octavia_driver_agent_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% if install_type == 'binary' %}
+    {% if base_package_type == 'rpm' %}
+        {% set octavia_driver_agent_packages = [
+            'python3-ovn-octavia-provider'
+        ] %}
+    {% elif base_package_type == 'deb' %}
+        {% set octavia_driver_agent_packages = [
+            'octavia-driver-agent',
+            'python3-ovn-octavia-provider'
+        ] %}
+    {% endif %}
+
+{% elif install_type == 'source' %}
+    {% set octavia_driver_agent_packages = [
+    ] %}
+
+    {% set octavia_driver_agent_plugins_pip_packages = [
+        '/plugins/*'
+    ] %}
+
+{{ macros.install_packages(octavia_driver_agent_packages | customizable("packages")) }}
+
+ADD plugins-archive /
+RUN if [ "$(ls /plugins)" ]; then \
+        {{ macros.install_pip(octavia_driver_agent_plugins_pip_packages) }} ; \
+    fi
+{% endif %}
+
+{% block octavia_driver_agent_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER octavia