openstack
/
kolla
Code Issues Proposed changes

Add kolla_ prefix for all sudoers files 

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

TrivialFix

Change-Id: I33cd58caf65a116c8442cb931699867b81dba616
This commit is contained in:
Jeffrey Zhang 2016-11-04 14:00:41 +08:00 committed by Jeffrey Zhang
parent d25ddf87f3
commit d9155867a9
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/bifrost/bifrost-base/Dockerfile.j2
View File

@ -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 %}

4
docker/etcd/Dockerfile.j2
View File

@ -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 %}

4
docker/kolla-toolbox/Dockerfile.j2
View File

@ -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 %}

4
docker/neutron/neutron-metadata-agent/Dockerfile.j2
View File

@ -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 %}