aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-16 21:58:30 +0000
committerGerrit Code Review <review@openstack.org>2016-02-16 21:58:30 +0000
commitf7c25b213de1cc9ae91c388c5122d22bf0c9348d (patch)
treec24e36dbb7cfad9d464c3db4d1abf416bfa95c33
parent4a7fa654fcc348186bba3fb77131eb1dcff0a170 (diff)
parent13121406358f99b0cea012b72715b8cac8181686 (diff)
downloadkolla-f7c25b213de1cc9ae91c388c5122d22bf0c9348d.tar.gz
kolla-f7c25b213de1cc9ae91c388c5122d22bf0c9348d.zip
Merge "Add manila perms to /var/cache/manila"
-rw-r--r--docker/manila/manila-base/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2
index 48dae07db..305bff96b 100644
--- a/docker/manila/manila-base/Dockerfile.j2
+++ b/docker/manila/manila-base/Dockerfile.j2
@@ -14,9 +14,9 @@ ADD manila-base-archive /manila-base-source
RUN ln -s manila-base-source/* manila \
&& useradd --user-group manila \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /manila \
- && mkdir -p /etc/manila /var/lib/manila /var/log/manila /home/manila \
+ && mkdir -p /etc/manila /var/lib/manila /var/cache/manila /var/log/manila /home/manila \
&& cp -r /manila/etc/manila/* /etc/manila/ \
- && chown -R manila: /etc/manila /var/lib/manila /var/log/manila /home/manila \
+ && chown -R manila: /etc/manila /var/lib/manila /var/cache/manila /var/log/manila /home/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
{% endif %}