diff options
Diffstat (limited to 'docker/manila')
| -rw-r--r-- | docker/manila/manila-api/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/manila/manila-base/Dockerfile.j2 | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index dece703f3..0e6d9e252 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/docker/manila/manila-api/Dockerfile.j2 @@ -16,7 +16,6 @@ COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start RUN mkdir -p /var/www/cgi-bin/manila \ && cp -a /var/lib/kolla/venv/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi \ && chmod 644 /usr/local/bin/kolla_manila_extend_start \ - && chown -R manila: /var/www/cgi-bin/manila \ && chmod 755 /var/www/cgi-bin/manila/manila-wsgi {% block manila_api_footer %}{% endblock %} diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index d484f8f0d..727996073 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -35,7 +35,7 @@ RUN ln -s manila-base-source/* manila \ && {{ macros.install_pip(manila_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/manila /var/cache/manila \ && cp -r /manila/etc/manila/* /etc/manila/ \ - && chown -R manila: /etc/manila /var/cache/manila \ + && chown -R manila: /var/cache/manila \ && 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/manila/rootwrap.conf \ && chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_manila_sudoers \ |