diff options
| author | Hongbin Lu <hongbin034@gmail.com> | 2018-09-30 16:14:31 +0000 |
|---|---|---|
| committer | Hongbin Lu <hongbin034@gmail.com> | 2018-09-30 16:14:31 +0000 |
| commit | 570a6120be48dde70a793be52574a0ae1e0fce6f (patch) | |
| tree | c08c10e6983012620a83fe4838f8e3e7ad3710ea /docker | |
| parent | 1e2db34c7fabe8591b3a84edaf92e313016caaaa (diff) | |
| download | kolla-570a6120be48dde70a793be52574a0ae1e0fce6f.tar.gz kolla-570a6120be48dde70a793be52574a0ae1e0fce6f.zip | |
Add /var/lib/kolla/venv/bin to Zun exec_dirs
This is necessary for rootwrap/privsep to work properly
Change-Id: I128fb04a5ddeb77428697d33e2015158bc74738f
Diffstat (limited to 'docker')
| -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 %} |