aboutsummaryrefslogtreecommitdiff
path: root/docker/manila
diff options
context:
space:
mode:
authorJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-07-02 19:59:44 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-07-05 05:49:13 +0000
commit3f79e37d21f7bda40656da2d9607cb4fe0c2c69a (patch)
tree23d8e75f1501af5dff0dee8208d31881c44b9e3f /docker/manila
parent10258f138b283a3c3dc3c873a3aa8149308f1ee7 (diff)
downloadkolla-3f79e37d21f7bda40656da2d9607cb4fe0c2c69a.tar.gz
kolla-3f79e37d21f7bda40656da2d9607cb4fe0c2c69a.zip
Fix the overwrite sudoers file issue
Change-Id: I4b109f7fdc3b8e49defed26979b04ca158842e98 Closes-Bug: #1598423
Diffstat (limited to 'docker/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 893c10ac9..2d6ee3c6b 100644
--- a/docker/manila/manila-base/Dockerfile.j2
+++ b/docker/manila/manila-base/Dockerfile.j2
@@ -41,9 +41,9 @@ RUN ln -s manila-base-source/* manila \
&& chown -R manila: /etc/manila /var/lib/manila /var/cache/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
-COPY manila_sudoers /etc/sudoers.d/manila_sudoers
+COPY manila_sudoers /etc/sudoers.d/kolla_manila_sudoers
RUN chmod 750 /etc/sudoers.d \
- && chmod 440 /etc/sudoers.d/manila_sudoers
+ && chmod 440 /etc/sudoers.d/kolla_manila_sudoers
{% endif %}