From d9155867a98cecfb1332793ed563094c3324b371 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Fri, 4 Nov 2016 14:00:41 +0800
Subject: [PATCH] Add kolla_ prefix for all sudoers files

Add kolla_ prefix for all sudoers files in case of overwrite.

TrivialFix

Change-Id: I33cd58caf65a116c8442cb931699867b81dba616
---
 docker/bifrost/bifrost-base/Dockerfile.j2           | 4 ++--
 docker/etcd/Dockerfile.j2                           | 4 ++--
 docker/kolla-toolbox/Dockerfile.j2                  | 4 ++--
 docker/neutron/neutron-metadata-agent/Dockerfile.j2 | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2
index ac251b57a9..2a79b0baa0 100644
--- a/docker/bifrost/bifrost-base/Dockerfile.j2
+++ b/docker/bifrost/bifrost-base/Dockerfile.j2
@@ -34,11 +34,11 @@ RUN bash -c './scripts/env-setup.sh && source ./env-vars && source /opt/stack/an
 {% endif %}
 
 
-COPY bifrost_sudoers /etc/sudoers.d/bifrost_sudoers
+COPY bifrost_sudoers /etc/sudoers.d/kolla_bifrost_sudoers
 
 RUN usermod -a -G kolla bifrost \
     && chmod 750 /etc/sudoers.d \
-    && chmod 440 /etc/sudoers.d/bifrost_sudoers \
+    && chmod 440 /etc/sudoers.d/kolla_bifrost_sudoers \
     && chown -R bifrost:bifrost /bifrost
 
 {% block bifrost_base_footer %}{% endblock %}
diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2
index dae3ec3987..829ff2352d 100644
--- a/docker/etcd/Dockerfile.j2
+++ b/docker/etcd/Dockerfile.j2
@@ -12,12 +12,12 @@ MAINTAINER {{ maintainer }}
 {% endif %}
 {{ macros.install_packages(etcd_packages | customizable("packages")) }}
 
-COPY etcd_sudoers /etc/sudoers.d/etcd_sudoers
+COPY etcd_sudoers /etc/sudoers.d/kolla_etcd_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 RUN chmod 755 /usr/local/bin/kolla_extend_start \
     && chmod 750 /etc/sudoers.d \
-    && chmod 440 /etc/sudoers.d/etcd_sudoers \
+    && chmod 440 /etc/sudoers.d/kolla_etcd_sudoers \
     && usermod -a -G kolla etcd
 
 {% block etcd_footer %}{% endblock %}
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 78b0a6cbde..6dc2d19521 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -67,8 +67,8 @@ RUN useradd -m --user-group ansible --groups kolla \
 COPY find_disks.py kolla_keystone_service.py kolla_keystone_user.py kolla_sanity.py /usr/share/ansible/
 COPY ansible.cfg /home/ansible/.ansible.cfg
 
-COPY ansible_sudoers /etc/sudoers.d/ansible_sudoers
-RUN chmod 440 /etc/sudoers.d/ansible_sudoers
+COPY ansible_sudoers /etc/sudoers.d/kolla_ansible_sudoers
+RUN chmod 440 /etc/sudoers.d/kolla_ansible_sudoers
 
 {% block kolla_toolbox_footer %}{% endblock %}
 {% block footer %}{% endblock %}
diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2
index 7aeaea12ca..383120501f 100644
--- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2
@@ -17,11 +17,11 @@ MAINTAINER {{ maintainer }}
 
 {{ macros.install_packages(neutron_metadata_agent_packages | customizable("packages")) }}
 
-COPY neutron_sudoers /etc/sudoers.d/neutron_sudoers
+COPY neutron_sudoers /etc/sudoers.d/kolla_neutron_metadata_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start
 RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start \
     && chmod 750 /etc/sudoers.d \
-    && chmod 440 /etc/sudoers.d/neutron_sudoers \
+    && chmod 440 /etc/sudoers.d/kolla_neutron_metadata_sudoers \
     && usermod -a -G kolla neutron
 
 {% block neutron_metadata_agent_footer %}{% endblock %}