aboutsummaryrefslogtreecommitdiff
path: root/docker/neutron
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/neutron
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/neutron')
-rw-r--r--docker/neutron/neutron-base/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 6aa895bf7..0cf05f786 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -68,11 +68,11 @@ RUN ln -s neutron-base-source/* neutron \
{% endif %}
-COPY neutron_sudoers /etc/sudoers.d/neutron_sudoers
+COPY neutron_sudoers /etc/sudoers.d/kolla_neutron_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN usermod -a -G kolla neutron \
&& chmod 750 /etc/sudoers.d \
- && chmod 440 /etc/sudoers.d/neutron_sudoers \
+ && chmod 440 /etc/sudoers.d/kolla_neutron_sudoers \
&& touch /usr/local/bin/kolla_neutron_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_neutron_extend_start