From a7ff9f6c0d2d5af14a0c9bebd0ceb932bbfeffb5 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 4 Apr 2022 13:35:01 +0200 Subject: [PATCH 1/7] elasticsearch: install Java first on CentOS too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit elasticsearch-oss package fails to install if we install it with Java: INFO:kolla.common.utils.elasticsearch:could not find java; set JAVA_HOME INFO:kolla.common.utils.elasticsearch:error: %prein(elasticsearch-oss-0:6.8.23-1.noarch) scriptlet failed, exit status 1 INFO:kolla.common.utils.elasticsearch:Error in PREIN scriptlet in rpm package elasticsearch-oss Backport down to ussuri needed. This change also includes a backport of I7d4788f5b63fba24e3b2f9b15c16866ff811d83e: Always use the distro-provided libvirt-python This patch switches masakari-monitors image to follow nova-compute and ceilometer-compute images. This will be used and required after [1] merges. Usage of libvirt-python from PyPI has already proven to be problematic on CentOS Stream in our stable branches. [2] With this patch we avoid those issues as well. [1] https://review.opendev.org/c/openstack/masakari-monitors/+/804913 [2] https://review.opendev.org/c/openstack/kolla/+/797102 Depends-On: https://review.opendev.org/c/openstack/masakari-monitors/+/804913 NOTE(hrw): added removal of libvirt-python from upper-constraints as we have never version of libvirt that Victoria used. This change also includes a backport of I5efab66e487e06abd1a56af97d7e7caa1ebc880d: Use jinja2.pass_context instead of contextfilter The contextfilter decorator was deprecated in jinja2 3.0.0, and has been dropped in 3.1.0. This results in the following warning, and failed attempts to use filters: [WARNING]: Skipping plugin (filters.py) as it seems to be invalid: module 'jinja2' has no attribute 'contextfilter' This change switches to use the pass_context decorator. The minimum version of Jinja2 is raised to 3 to ensure pass_context is present. This change has been updated to also support Jinja2 2.x releases, since the Wallaby upper constraints specify 2.11.3. In practice, most users will not use UC to install kolla. CoAuthored-by: Mark Goddard Finally, amended for Debian Buster to also skip the lower constraint from masakari-monitors. Finally, finally, includes also hotfix for contextfunction. Ie4bccb9ed3f4d8782730c5929abbfa73da215a8c Change-Id: I72d7920acd8d15941c8c57a4186186212b273a38 (cherry picked from commit 976465c448c4de2bd323021b946770b26ab1e912) --- docker/elasticsearch/elasticsearch/Dockerfile.j2 | 6 +++++- docker/masakari/masakari-monitors/Dockerfile.j2 | 8 +++++--- kolla/template/filters.py | 9 +++++++-- kolla/template/methods.py | 8 ++++++-- .../notes/jinja2-pass-context-3f3febcd944e3a51.yaml | 4 ++++ 5 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/jinja2-pass-context-3f3febcd944e3a51.yaml diff --git a/docker/elasticsearch/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/elasticsearch/Dockerfile.j2 index d09a0d8175..5633ce6d32 100644 --- a/docker/elasticsearch/elasticsearch/Dockerfile.j2 +++ b/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', ] %} diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2 index 50fb62aa94..a516d01a5d 100644 --- a/docker/masakari/masakari-monitors/Dockerfile.j2 +++ b/docker/masakari/masakari-monitors/Dockerfile.j2 @@ -19,7 +19,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% if base_package_type == 'rpm' %} {% set masakari_monitors_packages = [ - 'libvirt-devel', + 'python3-libvirt', 'pacemaker-cli', 'tcpdump', ] %} @@ -27,7 +27,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif base_package_type == 'deb' %} {% set masakari_monitors_packages = [ - 'libvirt-dev', + 'python3-libvirt', 'pacemaker-cli-utils', 'tcpdump', ] %} @@ -42,8 +42,10 @@ 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 \ - {% if distro_package_manager == 'dnf' %}&& sed -i -e 's/libvirt-python===.*/libvirt-python===6.10.0/' /requirements/upper-constraints.txt {% endif %}\ + && sed -i -e "/^libvirt-python/d" /requirements/upper-constraints.txt \ + && sed -i -e "/^libvirt-python/d" /masakari-monitors/requirements.txt \ && {{ macros.install_pip(masakari_monitors_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/masakari-monitors \ && chown -R masakari: /etc/masakari-monitors diff --git a/kolla/template/filters.py b/kolla/template/filters.py index 49708ee3fc..f2fbc6e145 100644 --- a/kolla/template/filters.py +++ b/kolla/template/filters.py @@ -12,11 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -from jinja2 import contextfilter +# NOTE: jinja2 3.1.0 dropped contextfilter in favour of pass_context. +try: + from jinja2 import pass_context +except ImportError: + from jinja2 import contextfilter as pass_context + from jinja2 import Undefined -@contextfilter +@pass_context def customizable(context, val_list, call_type): # NOTE(mgoddard): Don't try to customise undefined values. There are cases # where this might happen, for example using a generic template overrides diff --git a/kolla/template/methods.py b/kolla/template/methods.py index 19fcf4e22f..ba187158df 100644 --- a/kolla/template/methods.py +++ b/kolla/template/methods.py @@ -15,7 +15,11 @@ import os import yaml -from jinja2 import contextfunction +# NOTE: jinja2 3.1.0 dropped contextfunction in favour of pass_context. +try: + from jinja2 import pass_context +except ImportError: + from jinja2 import contextfunction as pass_context def debian_package_install(packages, clean_package_cache=True): @@ -71,7 +75,7 @@ def debian_package_install(packages, clean_package_cache=True): return ' && '.join(cmds) -@contextfunction +@pass_context def handle_repos(context, reponames, mode): """NOTE(hrw): we need to handle CentOS, Debian and Ubuntu with one macro. diff --git a/releasenotes/notes/jinja2-pass-context-3f3febcd944e3a51.yaml b/releasenotes/notes/jinja2-pass-context-3f3febcd944e3a51.yaml new file mode 100644 index 0000000000..3a7ecc729c --- /dev/null +++ b/releasenotes/notes/jinja2-pass-context-3f3febcd944e3a51.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fixes an issue seen when using Jinja2 3.1.0. From 238c56f53020da918f3c840eeffe9f41225892d7 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 31 Mar 2022 12:24:04 +0200 Subject: [PATCH 2/7] Fix disabling of curlrc in healthcheck_curl The -q (aka --disable) option only works if it is the first parameter on the command line. Change-Id: Ia9ab0bdc95e658c17e5be5abefcf96f1c05ee84f Closes-Bug: #1967272 (cherry picked from commit 196b742ba271fd7e3521448f83e8a2914f5c7dc6) --- docker/base/healthcheck_curl | 2 +- .../healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml diff --git a/docker/base/healthcheck_curl b/docker/base/healthcheck_curl index 2ef8538bac..6df232fe89 100755 --- a/docker/base/healthcheck_curl +++ b/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}" \ diff --git a/releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml b/releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml new file mode 100644 index 0000000000..c1c00d6ce5 --- /dev/null +++ b/releasenotes/notes/healthcheck-curl-disable-curlrc-0f85aad47379e2a5.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes disabling the use of the ``curlrc`` configuration file in + ``healthcheck_curl``. `LP#1967272 `__ From a83002b3faaba9f5803eb045eb7613417aea9b8c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 14 Apr 2022 15:32:47 +0200 Subject: [PATCH 3/7] enable logging to file for quiet mode We have 'quiet' mode where only minimal data is printed to the console. But there were no logs at all then. This change generates log files (if 'logs-dir' argument is used) during quiet build. Also enables 'quiet' mode for CI so Zuul will not have to parse 29MB JSON file each time. Change-Id: If7d5c2807f0947a8bbbc1ceb8531c9b9c9287c1f (cherry picked from commit 0cf5b1d4e6e871562c0ca0f48a21594f8d197471) --- kolla/common/utils.py | 34 +++++++++++++------ ...quiet-mode-with-logs-0abafc07923945ac.yaml | 6 ++++ tests/playbooks/run.yml | 1 + 3 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 releasenotes/notes/quiet-mode-with-logs-0abafc07923945ac.yaml diff --git a/kolla/common/utils.py b/kolla/common/utils.py index 9cd8ecca9d..0729127284 100644 --- a/kolla/common/utils.py +++ b/kolla/common/utils.py @@ -21,21 +21,33 @@ def make_a_logger(conf=None, image_name=None): log = logging.getLogger(".".join([__name__, image_name])) else: log = logging.getLogger(__name__) + + if conf is not None and conf.debug: + loglevel = logging.DEBUG + else: + loglevel = logging.INFO + if not log.handlers: - if conf is None or not conf.logs_dir or not image_name: - handler = logging.StreamHandler(sys.stderr) - log.propagate = False + stream_handler = logging.StreamHandler(sys.stderr) + stream_handler.setFormatter(logging.Formatter(logging.BASIC_FORMAT)) + # NOTE(hrw): quiet mode matters only on console + if conf is not None and conf.quiet: + stream_handler.setLevel(logging.CRITICAL) else: + stream_handler.setLevel(loglevel) + log.addHandler(stream_handler) + log.propagate = False + + if conf is not None and conf.logs_dir and image_name: filename = os.path.join(conf.logs_dir, "%s.log" % image_name) handler = logging.FileHandler(filename, delay=True) - handler.setFormatter(logging.Formatter(logging.BASIC_FORMAT)) - log.addHandler(handler) - if conf is not None and conf.debug: - log.setLevel(logging.DEBUG) - elif conf is not None and conf.quiet and image_name: - log.setLevel(logging.CRITICAL) - else: - log.setLevel(logging.INFO) + # NOTE(hrw): logfile will be INFO or DEBUG + handler.setLevel(loglevel) + handler.setFormatter(logging.Formatter(logging.BASIC_FORMAT)) + log.addHandler(handler) + + # NOTE(hrw): needs to be high, handlers have own levels + log.setLevel(logging.DEBUG) return log diff --git a/releasenotes/notes/quiet-mode-with-logs-0abafc07923945ac.yaml b/releasenotes/notes/quiet-mode-with-logs-0abafc07923945ac.yaml new file mode 100644 index 0000000000..1b8e67855a --- /dev/null +++ b/releasenotes/notes/quiet-mode-with-logs-0abafc07923945ac.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Quiet mode (enabled with ``--quiet`` argument) can be combined with + ``--logs-dir`` option now. Console output will be quiet as expected while + building output will be stored in separate log files. diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml index 6e319d30f7..ca5df44b1b 100644 --- a/tests/playbooks/run.yml +++ b/tests/playbooks/run.yml @@ -9,6 +9,7 @@ DEFAULT: debug: true logs_dir: "{{ kolla_build_logs_dir }}" + quiet: true base: "{{ base_distro }}" install_type: "{{ install_type }}" template_override: /etc/kolla/template_overrides.j2 From 3548fa66c8c6b781e734a28dab1823f02b0a080c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 30 Mar 2022 09:52:58 +0200 Subject: [PATCH 4/7] macros/pip: revert to old setuptools way AArch64 builds fail with "AttributeError: install_layout". This is due to setuptools issue in Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003252 Switching setuptools to use distutils from stdlib makes error go away. Backports: Xena, Wallaby (this is where it was first reported). Change-Id: I97102e18e4ec47bca94d17d964936f039580b06b (cherry picked from commit 497b40fe5a4984b959c63f0c5320311f5810192e) --- docker/macros.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/macros.j2 b/docker/macros.j2 index 7076e422c9..10765ad99d 100644 --- a/docker/macros.j2 +++ b/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 -%} From b716b5a5a761fa4a5cb826be2c38389727660715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 18 May 2022 16:20:12 +0200 Subject: [PATCH 5/7] Fix local sources of git repositories This is I2cbf1f539880d512aa223c3ef3a4b19ee18854ac extended to fix the case when a git repository is used with a git repo. This is probably a rarer use case but, still, we use it in CI for in-review changes testing. Change-Id: I77b0dcd2e9dfd8ea8390a471b80c8954b67ef91b (cherry picked from commit b888f68daf6cb3ed9782fe85045858b6a04d4911) --- kolla/image/build.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/kolla/image/build.py b/kolla/image/build.py index f558655595..efb11f9639 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -405,6 +405,15 @@ def followups(self): def process_source(self, image, source): dest_archive = os.path.join(image.path, source['name'] + '-archive') + # NOTE(mgoddard): Change ownership of files to root:root. This + # avoids an issue introduced by the fix for git CVE-2022-24765, + # which breaks PBR when the source checkout is not owned by the + # user installing it. LP#1969096 + def reset_userinfo(tarinfo): + tarinfo.uid = tarinfo.gid = 0 + tarinfo.uname = tarinfo.gname = "root" + return tarinfo + if source.get('type') == 'url': self.logger.debug("Getting archive from %s", source['source']) try: @@ -458,7 +467,8 @@ def process_source(self, image, source): if os.path.isdir(source['source']): with tarfile.open(dest_archive, 'w') as tar: tar.add(source['source'], - arcname=os.path.basename(source['source'])) + arcname=os.path.basename(source['source']), + filter=reset_userinfo) else: shutil.copyfile(source['source'], dest_archive) From 02dfa915a51b9abbb271e69f58fb8290742d5163 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 21 Mar 2022 11:44:38 +0000 Subject: [PATCH 6/7] masakari: add Cyrus SASL packages to monitors image Adds Cyrus SASL packages necessary for the DIGEST-MD5 and SCRAM-SHA-256 mechanisms. These can be used for libvirt SASL authentication. Follow up to I13e19ca29eeab40cd08fa3afe2cdf7531867f81b. Partial-Bug: #1964013 Change-Id: Ic4b6171789c3d360317599310492771bd78828ec (cherry picked from commit 5cc480a617c68ed20c80bffec16321a937f5a32b) (cherry picked from commit 444bdffcc7d4612fa6dd25fdead8f56428151735) --- docker/masakari/masakari-monitors/Dockerfile.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2 index a516d01a5d..b337ef0065 100644 --- a/docker/masakari/masakari-monitors/Dockerfile.j2 +++ b/docker/masakari/masakari-monitors/Dockerfile.j2 @@ -19,6 +19,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% if base_package_type == 'rpm' %} {% set masakari_monitors_packages = [ + 'cyrus-sasl-md5', + 'cyrus-sasl-scram', 'python3-libvirt', 'pacemaker-cli', 'tcpdump', @@ -27,8 +29,10 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif base_package_type == 'deb' %} {% set masakari_monitors_packages = [ + 'libsasl2-modules-gssapi-mit', 'python3-libvirt', 'pacemaker-cli-utils', + 'sasl2-bin', 'tcpdump', ] %} From ad72543a5d28920e5524eb9fa4a50065d8c5a5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Thu, 26 May 2022 10:27:53 +0200 Subject: [PATCH 7/7] Fix Ubuntu image builds Regarding rabbitmq and erlang. Change-Id: I6bc8b489a810849744c8bead6b9e350c5d3e36b7 (cherry picked from commit 240b3cf448354bf1a7271f8f81d730e51da856cb) --- docker/base/Dockerfile.j2 | 12 ++++++------ kolla/template/repos.yaml | 19 +++++++++---------- ...mq-erlang-cloudsmith-c837bf4a450dd802.yaml | 10 ++++++++++ 3 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 releasenotes/notes/rabbitmq-erlang-cloudsmith-c837bf4a450dd802.yaml diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 188f6d2aab..caed6ef56b 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -351,8 +351,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) #} {# A20F259AEB9C94BB -- Sensuapp (Freight) #} {# F1656F24C74CD1D8 -- MariaDB Signing Key #} - {# 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', @@ -362,8 +362,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', @@ -373,8 +373,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', diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index b675902131..c55cb699a7 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -47,52 +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 [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" - erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic main" + erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian buster main" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/debian buster stable" logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/debian buster main" - rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ buster main" + rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian buster main" td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib" debian-aarch64: elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" - erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic main" + erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian buster main" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/debian buster stable" logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./" mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/debian buster main" - rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ buster main" + rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian buster main" td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib" ubuntu: elasticsearch: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main" - erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main" + erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/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-6.x/apt stable main" kibana: "deb https://artifacts.elastic.co/packages/oss-6.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" - rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main" + rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu focal main" td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib" ubuntu-aarch64: elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" - erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main" + erlang: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/ubuntu focal stable" logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main" - rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main" + rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/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://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main" + rabbitmq: "deb https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu focal main" diff --git a/releasenotes/notes/rabbitmq-erlang-cloudsmith-c837bf4a450dd802.yaml b/releasenotes/notes/rabbitmq-erlang-cloudsmith-c837bf4a450dd802.yaml new file mode 100644 index 0000000000..b87bf97632 --- /dev/null +++ b/releasenotes/notes/rabbitmq-erlang-cloudsmith-c837bf4a450dd802.yaml @@ -0,0 +1,10 @@ +--- +fixes: + - | + Fixes the Debian and Ubuntu images to use rabbitmq and erlang from + cloudsmith so that the images are still buildable and use proper versions. +upgrade: + - | + The Debian and Ubuntu images use rabbitmq and erlang from cloudsmith now. + Operators might want to mirror/proxy this new source as it provides the + correct set of packages unlike the previous combination.