Skip to content

Commit 13d6a66

Browse files
committed
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
1 parent dbdc53f commit 13d6a66

File tree

11 files changed

+10
-17
lines changed

11 files changed

+10
-17
lines changed

docker/cinder/cinder-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +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/ \
47+
&& cp /var/lib/kolla/venv/etc/pycadf/cinder_api_audit_map.conf /etc/cinder/ \
4848
&& 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 \
4949
&& chmod 750 /etc/sudoers.d \
5050
&& chmod 440 /etc/sudoers.d/kolla_cinder_sudoers \

docker/glance/glance-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +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/ \
44+
&& cp /var/lib/kolla/venv/etc/pycadf/glance_api_audit_map.conf /etc/glance/ \
4545
&& 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 \
4646
&& chmod 750 /etc/sudoers.d \
4747
&& chmod 440 /etc/sudoers.d/kolla_glance_sudoers \

docker/gnocchi/gnocchi-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN {{ macros.upper_constraints_version_change("Werkzeug", "3.0.1", "2.2.3") }}
4646
RUN ln -s gnocchi-base-source/* gnocchi \
4747
&& {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages")) }} \
4848
&& mkdir -p /etc/gnocchi \
49-
&& cp /etc/pycadf/gnocchi_api_audit_map.conf /etc/gnocchi/ \
49+
&& cp /var/lib/kolla/venv/etc/pycadf/gnocchi_api_audit_map.conf /etc/gnocchi/ \
5050
&& chmod 750 /etc/sudoers.d \
5151
&& chmod 640 /etc/sudoers.d/kolla_gnocchi_sudoers \
5252
&& touch /usr/local/bin/kolla_gnocchi_extend_start \

docker/heat/heat-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +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/ \
30+
&& cp /var/lib/kolla/venv/etc/pycadf/heat_api_audit_map.conf /etc/heat/ \
3131
&& touch /usr/local/bin/kolla_heat_extend_start \
3232
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_heat_extend_start
3333

docker/ironic/ironic-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +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/ \
25+
&& cp /var/lib/kolla/venv/etc/pycadf/ironic_api_audit_map.conf /etc/ironic/ \
2626
&& 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 \
2727
&& chmod 750 /etc/sudoers.d \
2828
&& chmod 440 /etc/sudoers.d/kolla_ironic_sudoers \

docker/neutron/neutron-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +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/ \
77+
&& cp /var/lib/kolla/venv/etc/pycadf/neutron_api_audit_map.conf /etc/neutron/ \
7878
&& mv /etc/neutron/neutron/ /etc/neutron/plugins/ \
7979
&& 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 \
8080
&& if [ "$(ls /plugins)" ]; then \

docker/nova/nova-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +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/ \
73+
&& cp /var/lib/kolla/venv/etc/pycadf/nova_api_audit_map.conf /etc/nova/ \
7474
&& 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 \
7575
&& if [ "$(ls /plugins)" ]; then \
7676
{{ macros.install_pip(nova_base_plugins_pip_packages) }}; \

docker/openstack-base/Dockerfile.j2

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
137137
'pika',
138138
'prettytable',
139139
'psutil',
140-
'/plugins/pycadf*',
140+
'pycadf',
141141
'pymysql',
142142
'pyngus',
143143
'pyparsing',
@@ -186,9 +186,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
186186
ADD openstack-base-archive /openstack-base-source
187187
ADD plugins-archive /
188188

189-
RUN mkdir -p /etc/pycadf \
190-
&& cp /plugins/pycadf*/etc/pycadf/* /etc/pycadf/
191-
192189
RUN ln -s openstack-base-source/* /requirements \
193190

194191
{# NOTE(mnasiadka): Remove ovs from upper-constraints.txt because python3-openvswitch

docker/swift/swift-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN ln -s swift-base-source/* swift \
3737
&& {{ macros.install_pip(swift_base_pip_packages | customizable("pip_packages")) }} \
3838
&& mkdir -p /etc/swift /var/cache/swift /var/lock/swift \
3939
&& cp -r /swift/etc/* /etc/swift/ \
40-
&& cp /etc/pycadf/swift_api_audit_map.conf /etc/swift/ \
40+
&& cp /var/lib/kolla/venv/etc/pycadf/swift_api_audit_map.conf /etc/swift/ \
4141
&& chown -R swift: /var/cache/swift /var/lock/swift \
4242
&& chmod 750 /etc/sudoers.d \
4343
&& chmod 440 /etc/sudoers.d/kolla_swift_sudoers \

docker/trove/trove-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN ln -s trove-base-source/* trove \
2121
&& {{ macros.install_pip(trove_base_pip_packages | customizable("pip_packages")) }} \
2222
&& mkdir -p /etc/trove \
2323
&& cp -r /trove/etc/trove/* /etc/trove/ \
24-
&& cp /etc/pycadf/trove_api_audit_map.conf /etc/trove/ \
24+
&& cp /var/lib/kolla/venv/etc/pycadf/trove_api_audit_map.conf /etc/trove/ \
2525
&& touch /usr/local/bin/kolla_trove_extend_start \
2626
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_trove_extend_start
2727

0 commit comments

Comments
 (0)