From 7f5a904e98d7dd1213517257132d2eff23dfeadb Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Wed, 3 Jan 2024 15:30:27 +0100 Subject: Fix openstack CADF audit maps and installation This patch fixes missing pycadf's audit maps for services and change the way how pycadf is installed. Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/905858 Closes-Bug: #2047941 Change-Id: I9b43d1a9990ad8aa7381ea81b0f2d692967be949 --- docker/openstack-base/Dockerfile.j2 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'docker/openstack-base') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 51ad9409b..e50aaf560 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -135,7 +135,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'pika', 'prettytable', 'psutil', - 'pycadf', + '/pycadf', 'pyinotify', 'pymysql', 'pyngus', @@ -185,7 +185,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build %} ADD openstack-base-archive /openstack-base-source -RUN ln -s openstack-base-source/* /requirements \ +ADD plugins-archive /openstack-base-source + +RUN ln -s openstack-base-source/plugins/* /pycadf \ + && mkdir -p /etc/pycadf \ + && cp /pycadf/etc/pycadf/* /etc/pycadf/ + +RUN ln -s openstack-base-source/*requirements* /requirements \ + {# NOTE(mnasiadka): Remove ovs from upper-constraints.txt because python3-openvswitch is usually newer than UC entry and older version would get installed in venv (see https://launchpad.net/bugs/1961874). -- cgit v1.2.3