Skip to content

Commit 7f5a904

Browse files
keukobbezak
authored andcommitted
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
1 parent 0eddd35 commit 7f5a904

File tree

14 files changed

+29
-2
lines changed

14 files changed

+29
-2
lines changed

docker/ceilometer/ceilometer-base/Dockerfile.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ RUN ln -s ceilometer-base-source/* ceilometer \
2929
&& {{ macros.install_pip(ceilometer_base_pip_packages | customizable("pip_packages")) }} \
3030
&& mkdir -p /etc/ceilometer \
3131
&& cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \
32+
&& cp /etc/pycadf/ceilometer_api_audit_map.conf /etc/ceilometer/ \
3233
&& 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 \
3334
&& if [ "$(ls /plugins)" ]; then \
3435
{{ macros.install_pip(ceilometer_base_plugins_pip_packages) }}; \

docker/cinder/cinder-base/Dockerfile.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ RUN ln -s cinder-base-source/* cinder \
4444
&& {{ macros.install_pip(cinder_base_pip_packages | customizable("pip_packages")) }} \
4545
&& mkdir -p /etc/cinder \
4646
&& cp -r /cinder/etc/cinder/* /etc/cinder/ \
47+
&& cp /etc/pycadf/cinder_api_audit_map.conf /etc/cinder/ \
4748
&& 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/cinder/rootwrap.conf \
4849
&& chmod 750 /etc/sudoers.d \
4950
&& chmod 440 /etc/sudoers.d/kolla_cinder_sudoers \

docker/glance/glance-base/Dockerfile.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ RUN ln -s glance-base-source/* glance \
4141
&& {{ macros.install_pip(glance_base_pip_packages | customizable("pip_packages")) }} \
4242
&& mkdir -p /etc/glance \
4343
&& cp -r /glance/etc/* /etc/glance/ \
44+
&& cp /etc/pycadf/glance_api_audit_map.conf /etc/glance/ \
4445
&& 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/glance/rootwrap.conf \
4546
&& chmod 750 /etc/sudoers.d \
4647
&& chmod 440 /etc/sudoers.d/kolla_glance_sudoers \

docker/gnocchi/gnocchi-base/Dockerfile.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ COPY gnocchi_sudoers /etc/sudoers.d/kolla_gnocchi_sudoers
4444
RUN ln -s gnocchi-base-source/* gnocchi \
4545
&& {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages")) }} \
4646
&& mkdir -p /etc/gnocchi \
47+
&& cp /etc/pycadf/gnocchi_api_audit_map.conf /etc/gnocchi/ \
4748
&& chmod 750 /etc/sudoers.d \
4849
&& chmod 640 /etc/sudoers.d/kolla_gnocchi_sudoers \
4950
&& touch /usr/local/bin/kolla_gnocchi_extend_start \

docker/heat/heat-base/Dockerfile.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ RUN ln -s heat-base-source/* heat \
2727
&& {{ macros.install_pip(heat_base_pip_packages | customizable("pip_packages")) }} \
2828
&& mkdir -p /etc/heat \
2929
&& cp -r /heat/etc/heat/* /etc/heat/ \
30+
&& cp /etc/pycadf/heat_api_audit_map.conf /etc/heat/ \
3031
&& touch /usr/local/bin/kolla_heat_extend_start \
3132
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_heat_extend_start
3233

docker/ironic/ironic-base/Dockerfile.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ RUN ln -s ironic-base-source/* ironic \
2222
&& {{ macros.install_pip(ironic_base_pip_packages | customizable("pip_packages")) }} \
2323
&& mkdir -p /etc/ironic \
2424
&& cp -r /var/lib/kolla/venv/etc/ironic/* /etc/ironic/ \
25+
&& cp /etc/pycadf/ironic_api_audit_map.conf /etc/ironic/ \
2526
&& 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/ironic/rootwrap.conf \
2627
&& chmod 750 /etc/sudoers.d \
2728
&& chmod 440 /etc/sudoers.d/kolla_ironic_sudoers \

docker/neutron/neutron-base/Dockerfile.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ RUN ln -s neutron-base-source/* neutron \
7474
&& mkdir -p /etc/neutron \
7575
&& cp -r /neutron/etc/* /etc/neutron/ \
7676
&& cp -r /neutron/etc/neutron/* /etc/neutron/ \
77+
&& cp /etc/pycadf/neutron_api_audit_map.conf /etc/neutron/ \
7778
&& mv /etc/neutron/neutron/ /etc/neutron/plugins/ \
7879
&& 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/neutron/rootwrap.conf \
7980
&& if [ "$(ls /plugins)" ]; then \

docker/nova/nova-base/Dockerfile.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ RUN ln -s nova-base-source/* nova \
7070
&& {{ macros.install_pip(nova_base_pip_packages | customizable("pip_packages")) }} \
7171
&& mkdir -p /etc/nova/ \
7272
&& cp -r /nova/etc/nova/* /etc/nova/ \
73+
&& cp /etc/pycadf/nova_api_audit_map.conf /etc/nova/ \
7374
&& 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/nova/rootwrap.conf \
7475
&& if [ "$(ls /plugins)" ]; then \
7576
{{ macros.install_pip(nova_base_plugins_pip_packages) }}; \

docker/octavia/octavia-base/Dockerfile.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ RUN ln -s /octavia-base-source/* octavia \
2828
&& {{ macros.install_pip(octavia_base_pip_packages | customizable("pip_packages")) }} \
2929
&& mkdir -p /etc/octavia \
3030
&& cp -r /octavia/etc/* /etc/octavia/ \
31+
&& cp /octavia/etc/audit/octavia_api_audit_map.conf.sample /etc/octavia/octavia_api_audit_map.conf \
3132
&& touch /usr/local/bin/kolla_octavia_extend_start \
3233
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_octavia_extend_start
3334

docker/openstack-base/Dockerfile.j2

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
135135
'pika',
136136
'prettytable',
137137
'psutil',
138-
'pycadf',
138+
'/pycadf',
139139
'pyinotify',
140140
'pymysql',
141141
'pyngus',
@@ -185,7 +185,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
185185
%}
186186

187187
ADD openstack-base-archive /openstack-base-source
188-
RUN ln -s openstack-base-source/* /requirements \
188+
ADD plugins-archive /openstack-base-source
189+
190+
RUN ln -s openstack-base-source/plugins/* /pycadf \
191+
&& mkdir -p /etc/pycadf \
192+
&& cp /pycadf/etc/pycadf/* /etc/pycadf/
193+
194+
RUN ln -s openstack-base-source/*requirements* /requirements \
195+
189196
{# NOTE(mnasiadka): Remove ovs from upper-constraints.txt because python3-openvswitch
190197
is usually newer than UC entry and older version would get installed
191198
in venv (see https://launchpad.net/bugs/1961874).

0 commit comments

Comments
 (0)