openstack
/
kolla
Code Issues Proposed changes

Merge "copy rootwarp files form venv in ironic base"

This commit is contained in:
Zuul 2020-07-20 12:47:31 +00:00 committed by Gerrit Code Review
parent c8679b4ac4 b6c7110409
commit 9e4371d35a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/ironic/ironic-base/Dockerfile.j2
View File

@ -29,7 +29,7 @@ ADD ironic-base-archive /ironic-base-source
RUN ln -s ironic-base-source/* ironic \
&& {{ macros.install_pip(ironic_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/ironic \
&& cp -r /ironic/etc/ironic/* /etc/ironic/ \
&& cp -r /var/lib/kolla/venv/etc/ironic/* /etc/ironic/ \
&& chown -R ironic: /etc/ironic \
&& 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