diff options
| author | Michal Arbet <michal.arbet@ultimum.io> | 2024-01-03 15:30:27 +0100 |
|---|---|---|
| committer | Bartosz Bezak <bartosz@stackhpc.com> | 2024-01-17 11:52:20 +0000 |
| commit | 7f5a904e98d7dd1213517257132d2eff23dfeadb (patch) | |
| tree | cb477c4ebfce52c4a17a64bcb91c3dc565d3259b /docker/openstack-base | |
| parent | 0eddd35da52c3e74a4c372796bf65247b261f7f0 (diff) | |
| download | kolla-7f5a904e98d7dd1213517257132d2eff23dfeadb.tar.gz kolla-7f5a904e98d7dd1213517257132d2eff23dfeadb.zip | |
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
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 11 |
1 files changed, 9 insertions, 2 deletions
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). |