Merge remote-tracking branch 'upstream/stable/victoria' into sync/stable/victoria

cityofships · cityofships · commit d730247d2a71 · 2021-06-23T15:17:39.000+02:00
diff --git a/doc/source/contributor/contributing.rst b/doc/source/contributor/contributing.rst
@@ -22,7 +22,7 @@ Communication
 ~~~~~~~~~~~~~
 
 IRC Channel
-    ``#openstack-kolla`` (`channel logs`_) on Freenode
+    ``#openstack-kolla`` (`channel logs`_) on `OFTC <http://oftc.net>`_
 
 Weekly Meetings
     On Wednesdays at 15:00 UTC in the IRC channel (`meetings logs`_)
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
@@ -86,7 +86,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
         'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
         'https://packages.grafana.com/gpg.key',
         'https://repos.influxdata.com/influxdb.key',
-        'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
+        'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
         'https://packages.treasuredata.com/GPG-KEY-td-agent',
     ] %}
 {% elif base_arch == 'aarch64' %}
@@ -99,8 +99,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
 
     {% set base_yum_repo_keys = [
         'https://packages.grafana.com/gpg.key',
-        'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
-        'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/centos7/repodata/repomd.xml.key',
+        'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
     ] %}
     # FIXME(mgoddard): Not available for CentOS 8 yet.
     #
@@ -342,6 +341,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
     {# 901F9177AB97ACBE                         -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #}
     {# A20F259AEB9C94BB                         -- Sensuapp (Freight) <support@hw-ops.com> #}
     {# F1656F24C74CD1D8                         -- MariaDB Signing Key <signing-key@mariadb.org> #}
+    {# F77F1EDA57EBB1CC                         -- Launchpad RabbitMQ Erlang PPA key #}
+    {# F6609E60DC62814E                         -- PackageCloud RabbitMQ repository key #}
     {% set base_apt_keys = [
       '391A9AA2147192839E9DB0315EDB1B62EC4926EA',
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
@@ -351,20 +352,18 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
       '901F9177AB97ACBE',
       'A20F259AEB9C94BB',
       'F1656F24C74CD1D8',
+      'F77F1EDA57EBB1CC',
+      'F6609E60DC62814E',
     ] %}
     {% set remote_apt_keys = [
-      'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
       'https://packages.grafana.com/gpg.key',
       'https://repos.influxdata.com/influxdb.key',
     ] %}
-    {% if base_arch == 'aarch64' %}
-        {% set remote_apt_keys = remote_apt_keys + [
-          'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-bionic/Release.key',
-        ] %}
-    {% endif %}
 {% elif base_distro == 'debian' %}
     {% set base_apt_keys = [
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
+      'F77F1EDA57EBB1CC',
+      'F6609E60DC62814E',
     ] %}
     {% set remote_apt_keys = [
       'https://download.docker.com/linux/debian/gpg',
@@ -373,13 +372,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
       'https://packages.treasuredata.com/GPG-KEY-td-agent',
       'https://repos.influxdata.com/influxdb.key',
       'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key',
-      'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
     ] %}
-    {% if base_arch == 'aarch64' %}
-        {% set remote_apt_keys = remote_apt_keys + [
-          'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key',
-        ] %}
-    {% endif %}
     {% set base_apt_packages = base_apt_packages +
       ['sudo',]
     %}
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu
@@ -1,3 +1,12 @@
 Package: rabbitmq-server
 Pin: version 3.8.*
 Pin-Priority: 1000
+
+Package: erlang*
+Pin: version 1:23.*
+Pin-Priority: 1000
+
+# FIXME(mgoddard): Pinning to 4.0.* to avoid bug 1930867.
+Package: td-agent*
+Pin: version 4.0.*
+Pin-Priority: 1000
diff --git a/docker/base/rabbitmq_rabbitmq-erlang.repo b/docker/base/rabbitmq_rabbitmq-erlang.repo
@@ -1,6 +1,5 @@
 [rabbitmq_rabbitmq-erlang]
 name=rabbitmq_rabbitmq-erlang
-baseurl=https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/22/el/$releasever/
+baseurl=https://packagecloud.io/rabbitmq/erlang/el/8/$basearch
 gpgcheck=1
 enabled=0
-gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc
diff --git a/docker/base/rabbitmq_rabbitmq-server.repo b/docker/base/rabbitmq_rabbitmq-server.repo
@@ -1,6 +1,5 @@
 [rabbitmq_rabbitmq-server]
 name=rabbitmq_rabbitmq-server
-baseurl=https://dl.bintray.com/rabbitmq/rpm/rabbitmq-server/v3.8.x/el/$releasever/
+baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/8/$basearch
 gpgcheck=1
 enabled=0
-gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc
diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian
@@ -4,6 +4,9 @@ deb http://deb.debian.org/debian buster main
 # debian security updates
 deb http://security.debian.org/debian-security buster/updates main
 
+# debian updates
+deb http://deb.debian.org/debian buster-updates main
+
 # debian backports
 deb http://deb.debian.org/debian buster-backports main
 
@@ -31,6 +34,3 @@ deb http://buster-victoria.debian.net/debian buster-victoria-backports-nochange
 
 # erlang repo
 #deb https://dl.bintray.com/rabbitmq-erlang/debian/ buster erlang
-
-# erlang repo - aarch64 only
-#deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
@@ -34,13 +34,10 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/victoria main
 #deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main
 
 # rabbitmq repo
-#deb https://dl.bintray.com/rabbitmq/debian/ focal main
+#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
 
 # erlang repo
-#deb https://dl.bintray.com/rabbitmq-erlang/debian/ focal erlang
-
-# erlang repo - aarch64 only
-#deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-focal ./
+#deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main
 
 # MariaDB repo
 #deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main
diff --git a/docker/fluentd/Dockerfile.j2 b/docker/fluentd/Dockerfile.j2
@@ -27,8 +27,9 @@ LABEL fluentd_version="0.14" fluentd_binary="td-agent"
     ] %}
 
     {% if base_arch in ['aarch64', 'x86_64'] %}
+        # FIXME(mgoddard): Pinning to 4.0.* to avoid bug 1930867.
         {% set fluentd_packages = fluentd_packages + [
-            'td-agent'
+            'td-agent-4.0.*'
         ] %}
     {% else %}
         {% set fluentd_packages = fluentd_packages + [
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2
@@ -52,16 +52,6 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages
             'librados2-devel',
         ] %}
 
-        # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le
-        # it needs to be built
-
-        {% if base_arch != 'x86_64' %}
-            {% set gnocchi_base_packages = gnocchi_base_packages + [
-                'blas-devel',
-                'lapack-devel'
-            ] %}
-        {% endif %}
-
 {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
 RUN mkdir -p /var/www/cgi-bin/gnocchi
     {% elif base_package_type == 'deb' %}
@@ -70,16 +60,6 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi
             'librados-dev',
         ] %}
 
-        # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le
-        # it needs to be built
-
-        {% if base_arch != 'x86_64' %}
-            {% set gnocchi_base_packages = gnocchi_base_packages + [
-                'libblas-dev',
-                'liblapack-dev'
-            ] %}
-        {% endif %}
-
 {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
 
    {% endif %}
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
@@ -160,7 +160,7 @@ function config_monasca_ui {
         "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_50_admin_add_monitoring_panel.py"
     config_dashboard "${ENABLE_MONASCA:-no}" \
         "${SITE_PACKAGES}/monitoring/conf/monitoring_policy.json" \
-        "${SITE_PACKAGES}/openstack_dashboard/conf/monitoring_policy.json"
+        "/etc/openstack-dashboard/monitoring_policy.json"
 }
 
 function config_murano_dashboard {
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
@@ -17,6 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['rabbitmq', 'erlang']) }}
 
 {% if base_package_type == 'rpm' %}
+
     {% set kolla_toolbox_packages = [
         'crudini',
         'gcc',
@@ -33,9 +34,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'openssl-devel',
         'openvswitch',
         'python3-devel',
-        'rabbitmq-server-3.8.*'
         ] %}
 
+    {% if base_arch == 'aarch64' %}
+        {% set kolla_toolbox_packages = kolla_toolbox_packages + [
+            'erlang-22.*',
+            'rabbitmq-server-3.8.14'
+            ] %}
+    {% else %}
+        {% set kolla_toolbox_packages = kolla_toolbox_packages + [
+            'erlang-23.*',
+            'rabbitmq-server-3.8.*'
+            ] %}
+    {% endif %}
+
 {% elif base_package_type == 'deb' %}
     {% set kolla_toolbox_packages = [
         'build-essential',
diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2
@@ -43,6 +43,7 @@ ADD masakari-monitors-archive /masakari-monitors-source
 ] %}
 
 RUN ln -s masakari-monitors-source/* masakari-monitors \
+    {% if distro_package_manager == 'dnf' %}&& sed -i -e 's/libvirt-python===.*/libvirt-python===6.10.0/' /requirements/upper-constraints.txt {% endif %}\
     && {{ macros.install_pip(masakari_monitors_pip_packages | customizable("pip_packages")) }} \
     && mkdir -p /etc/masakari-monitors \
     && chown -R masakari: /etc/masakari-monitors
diff --git a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
@@ -19,7 +19,8 @@ RUN echo 'image not yet available for {{ base_distro }}' \
 {% elif base_package_type == 'deb' %}
 
 {% set ovs_dpdk_packages = [
-    'openvswitch-switch-dpdk'
+    'openvswitch-switch-dpdk',
+    'crudini'
 ] %}
 
 {{ macros.install_packages(ovs_dpdk_packages | customizable("packages")) }}
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
@@ -13,11 +13,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block rabbitmq_install %}
 {% if base_package_type == 'rpm' %}
+
     {% set rabbitmq_packages = [
         'hostname',
-        'rabbitmq-server-3.8.*'
     ] %}
 
+    {% if base_arch == 'aarch64' %}
+        {% set rabbitmq_packages = rabbitmq_packages + [
+            'erlang-22.*',
+            'rabbitmq-server-3.8.14'
+        ] %}
+    {% else %}
+        {% set rabbitmq_packages = rabbitmq_packages + [
+            'erlang-23.*',
+            'rabbitmq-server-3.8.*'
+        ] %}
+    {% endif %}
+
 {% elif base_package_type == 'deb' %}
     {% set rabbitmq_packages = [
         'logrotate',
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
@@ -24,6 +24,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% endif %}
 
 {{ macros.install_packages(swift_base_packages | customizable("packages")) }}
+    {# NOTE(mgoddard): UCA packages seem to modify the group membership for #}
+    {# the swift user, removing it from the kolla group. #}
+    {% if base_package_type == 'deb' %}
+RUN usermod --append --groups kolla swift
+    {% endif %}
 {% elif install_type == 'source' %}
     {% if base_package_type == 'rpm' %}
         {% set swift_base_packages = [
diff --git a/kolla/image/build.py b/kolla/image/build.py
@@ -172,6 +172,7 @@ class Status(Enum):
         "senlin-conductor",  # no binary package
         "senlin-health-manager",  # no binary package
         "tacker-base",
+        "trove-base",          # package is not installable
         "neutron-mlnx-agent",
     },
 
@@ -789,6 +790,7 @@ def _get_images_dir(self):
             PROJECT_ROOT,
             os.path.join(sys.prefix, 'share/kolla'),
             os.path.join(sys.prefix, 'local/share/kolla'),
+            os.path.join(os.getenv('HOME', ''), '.local/share/kolla'),
             # NOTE(zioproto): When Kolla is used within a snap, the env var
             #                 $SNAP is the directory where the snap is mounted.
             #                 https://github.com/zioproto/snap-kolla
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
@@ -47,50 +47,51 @@ rhel:
   opstools: "centos-opstools"
   rabbitmq: "centos-rabbitmq-38"
 
+# NOTE(mnasiadka): Erlang repo - Debian Buster/Bullseye needs to use bionic as per RabbitMQ docs
 debian:
+
   elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
-  erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ buster erlang"
+  erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic main"
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/debian buster stable"
   logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
-  rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main"
+  rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ buster main"
   td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib"
 
 debian-aarch64:
   elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
-  erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
+  erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic main"
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/debian buster stable"
   logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
-  rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main"
+  rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ buster main"
   td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib"
 
 ubuntu:
   elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
-  erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ focal erlang"
+  erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
   logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   kibana: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
   qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main"
-  # NOTE(hrw): upstream uses bionic repo for focal
-  rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
+  rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main"
   td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
 
 ubuntu-aarch64:
   elasticsearch: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
-  erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-focal ./"
+  erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
   logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main"
   mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
-  rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
+  rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main"
   td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
 
 ubuntu-ppc64le:
   mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
-  rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
+  rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main"
diff --git a/releasenotes/notes/bug-1905279-41d664114ef26a16.yaml b/releasenotes/notes/bug-1905279-41d664114ef26a16.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue with Swift containers failing to start in Ubuntu binary
+    images. `LP#1905279
+    <https://bugs.launchpad.net/kolla-ansible/+bug/1905279>`__
diff --git a/releasenotes/notes/bug-1928408-4a22a85570eee8d6.yaml b/releasenotes/notes/bug-1928408-4a22a85570eee8d6.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes location of monitoring_policy in Horizon, so access
+    policy is correctly enforced.  Note that by current default,
+    admin doesn't not have Monitoring access.
+    `LP#1928408 <https://launchpad.net/bugs/1928408>`__
diff --git a/releasenotes/notes/bug-1930544-a8926990f3a578a9.yaml b/releasenotes/notes/bug-1930544-a8926990f3a578a9.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix support for kolla install in ``~/.local``. `LP#1930544
+    <https://launchpad.net/bugs/1930544>`__
diff --git a/releasenotes/notes/bug-1930867.yaml b/releasenotes/notes/bug-1930867.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue with logs going missing in the Fluentd pipeline
+    by pinning td-agent to 4.0.*.
+    `LP#1930867 <https://launchpad.net/bugs/1930867>`__
diff --git a/releasenotes/notes/bug-1931544-5a091735efb6d6dd.yaml b/releasenotes/notes/bug-1931544-5a091735efb6d6dd.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    Fixes issues arising from the lack of Debian updates repo being enabled.
+    `LP#1931544 <https://launchpad.net/bugs/1931544>`__
+other:
+  - |
+    Debian images enable the Debian updates repo now. This is aligned with
+    the base Debian image.
diff --git a/releasenotes/notes/rabbitmq-packagecloud-c009ff6d0d2bd02d.yaml b/releasenotes/notes/rabbitmq-packagecloud-c009ff6d0d2bd02d.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    RabbitMQ and Erlang packages are now installed from ``packagecloud.io``
+    (and PPA for Debian/Ubuntu) since ``bintray.com`` is getting shut down
+    May 1st, 2021.
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ function config_monasca_ui {`
`160`	`160`	`"${SITE_PACKAGES}/openstack_dashboard/local/enabled/_50_admin_add_monitoring_panel.py"`
`161`	`161`	`config_dashboard "${ENABLE_MONASCA:-no}" \`
`162`	`162`	`"${SITE_PACKAGES}/monitoring/conf/monitoring_policy.json" \`
`163`		`- "${SITE_PACKAGES}/openstack_dashboard/conf/monitoring_policy.json"`
	`163`	`+ "/etc/openstack-dashboard/monitoring_policy.json"`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`function config_murano_dashboard {`