diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-04 15:37:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-04 15:37:21 +0000 |
| commit | beda1a8410811aa982b29d40e6a1eecd96ee16e5 (patch) | |
| tree | 21e145b35112b8e5e71924ced9fb225db5193653 | |
| parent | bff8f95b953d5d11bdc95e5f5e28088619e7dfda (diff) | |
| parent | 570a6120be48dde70a793be52574a0ae1e0fce6f (diff) | |
| download | kolla-beda1a8410811aa982b29d40e6a1eecd96ee16e5.tar.gz kolla-beda1a8410811aa982b29d40e6a1eecd96ee16e5.zip | |
Merge "Add /var/lib/kolla/venv/bin to Zun exec_dirs"
| -rw-r--r-- | docker/zun/zun-base/Dockerfile.j2 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2 index 4e887bcee..3aeac2a1f 100644 --- a/docker/zun/zun-base/Dockerfile.j2 +++ b/docker/zun/zun-base/Dockerfile.j2 @@ -52,7 +52,8 @@ RUN ln -s zun-base-source/* zun \ && mkdir -p /etc/zun /var/www/cgi-bin/zun \ && cp -r /zun/etc/zun/* /etc/zun/ \ && cp /zun/zun/api/app.wsgi /var/www/cgi-bin/zun \ - && chown -R zun: /etc/zun /var/www/cgi-bin/zun + && chown -R zun: /etc/zun /var/www/cgi-bin/zun \ + && 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/zun/rootwrap.conf {% endif %} |