From cf1dc75f3474f9810fb79d1c327f08134a920b6c Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Fri, 4 Nov 2016 01:09:48 +0800
Subject: [PATCH] Fix cinder volume permission issue
cinder volume container overwrite the default cinder_sudoers file in
Ubuntu binary install type. Rename it to kolla_cinder_volume_sudoers
Change-Id: I20a362ccb3b4d8e6422f63a1815b62ba47c9d7c1
Closes-Bug: #1638585
---
docker/cinder/cinder-volume/Dockerfile.j2 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index 6e5d275edf..00e4e51275 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -43,11 +43,11 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
{% endif %}
{% endif %}
-COPY cinder_sudoers /etc/sudoers.d/cinder_sudoers
+COPY cinder_sudoers /etc/sudoers.d/kolla_cinder_volume_sudoers
COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start
RUN chmod 750 /etc/sudoers.d \
- && chmod 440 /etc/sudoers.d/cinder_sudoers \
+ && chmod 440 /etc/sudoers.d/kolla_cinder_volume_sudoers \
&& chmod 755 /usr/local/bin/kolla_cinder_extend_start
{% block cinder_volume_footer %}{% endblock %}