Skip to content

Commit b6c7110

Browse files
committed
copy rootwarp files form venv in ironic base
This change modifies the ironic base container to copy rootwarp filters from the virtual env rather than the source code directory. This is need because some required filters have been moved to ironic-lib and are not present in the /ironic dir. The rootwrap filters are not automitaclly installed in /etc/... due to kolla use of virtual envs and pypa/wheel#92 Closes-Bug: #1886663 Change-Id: Idb0a675d92bab8b9a0cf5209f0a06e996e96033c
1 parent 22d7ffa commit b6c7110

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

docker/ironic/ironic-base/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ADD ironic-base-archive /ironic-base-source
2929
RUN ln -s ironic-base-source/* ironic \
3030
&& {{ macros.install_pip(ironic_base_pip_packages | customizable("pip_packages")) }} \
3131
&& mkdir -p /etc/ironic \
32-
&& cp -r /ironic/etc/ironic/* /etc/ironic/ \
32+
&& cp -r /var/lib/kolla/venv/etc/ironic/* /etc/ironic/ \
3333
&& chown -R ironic: /etc/ironic \
3434
&& 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
3535

0 commit comments

Comments
 (0)