diff options
| author | Sean Mooney <work@seanmooney.info> | 2020-07-06 22:51:21 +0000 |
|---|---|---|
| committer | Sean Mooney <work@seanmooney.info> | 2020-07-07 13:19:41 +0000 |
| commit | b6c7110409a5658de6e4d7d468d55a1d7ad49232 (patch) | |
| tree | 7f10ff86d2be9cdc098cf63eeafbde6aa171a071 | |
| parent | 22d7ffa382ea7a7a6bd0ac1b46699529175d7328 (diff) | |
| download | kolla-b6c7110409a5658de6e4d7d468d55a1d7ad49232.tar.gz kolla-b6c7110409a5658de6e4d7d468d55a1d7ad49232.zip | |
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 https://github.com/pypa/wheel/issues/92
Closes-Bug: #1886663
Change-Id: Idb0a675d92bab8b9a0cf5209f0a06e996e96033c
| -rw-r--r-- | docker/ironic/ironic-base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 5ed1defd0..9e83b3c69 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -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 |