diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-20 12:47:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-20 12:47:31 +0000 |
| commit | 9e4371d35aac6293d430d992585e48ddc5be1f05 (patch) | |
| tree | 1032b7a0db73225f2e33b5a5ffdedd40280fc00a /docker | |
| parent | c8679b4ac46b744562e244a9dddd01ada06c0c5e (diff) | |
| parent | b6c7110409a5658de6e4d7d468d55a1d7ad49232 (diff) | |
| download | kolla-9e4371d35aac6293d430d992585e48ddc5be1f05.tar.gz kolla-9e4371d35aac6293d430d992585e48ddc5be1f05.zip | |
Merge "copy rootwarp files form venv in ironic base"
Diffstat (limited to 'docker')
| -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 |