From 13d6a664f063b5c65ce957bac21652111a13d6b7 Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Mon, 3 Feb 2025 11:40:04 +0100 Subject: Install pycadf from pypi package Previously, the `pycadf` package did not include configuration files, so they were manually installed from source. However, this was fixed in pycadf's upstream in [1], allowing us to rely on the package itself. Additionally, the `ceilometer_api_audit_map.conf` file has been removed, as it was dropped in pycadf's upstream commit here [2] [1] https://review.opendev.org/c/openstack/pycadf/+/936741 [2] https://review.opendev.org/c/openstack/pycadf/+/930971 Change-Id: I022aa4c403f08385beb83b5d0c81f8abb42eb4a7 --- docker/openstack-base/Dockerfile.j2 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'docker/openstack-base') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index af6492377..8cb8a97b7 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -137,7 +137,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'pika', 'prettytable', 'psutil', - '/plugins/pycadf*', + 'pycadf', 'pymysql', 'pyngus', 'pyparsing', @@ -186,9 +186,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ADD openstack-base-archive /openstack-base-source ADD plugins-archive / -RUN mkdir -p /etc/pycadf \ - && cp /plugins/pycadf*/etc/pycadf/* /etc/pycadf/ - RUN ln -s openstack-base-source/* /requirements \ {# NOTE(mnasiadka): Remove ovs from upper-constraints.txt because python3-openvswitch -- cgit v1.2.3