From ff55c29259ed985bc8e5a01a5d3f62011c138cd2 Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Fri, 31 Jan 2025 13:34:18 +0100 Subject: [PATCH] Bump pycadf version to 4.0.1 This patch also removing copy of ceilometer_api_audit_map.conf file as it is now removed [1]. [1] https://review.opendev.org/c/openstack/pycadf/+/930971 Change-Id: I7c086ed5da0e3713ac15aaeaceb38f4a05b84bf0 --- docker/ceilometer/ceilometer-base/Dockerfile.j2 | 1 - kolla/common/sources.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index a4be457378..eb0fc1d02e 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -29,7 +29,6 @@ RUN ln -s ceilometer-base-source/* ceilometer \ && {{ macros.install_pip(ceilometer_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/ceilometer \ && cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \ - && cp /etc/pycadf/ceilometer_api_audit_map.conf /etc/ceilometer/ \ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/ceilometer/rootwrap.conf \ && if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(ceilometer_base_plugins_pip_packages) }}; \ diff --git a/kolla/common/sources.py b/kolla/common/sources.py index af42ff5c85..fbcab144e8 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -18,7 +18,7 @@ SOURCES = { 'openstack-base-plugin-pycadf': { 'type': 'url', 'location': ('$tarballs_base/openstack/pycadf/' - 'pycadf-4.0.0.tar.gz')}, + 'pycadf-4.0.1.tar.gz')}, 'aodh-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/aodh/'