openstack/kolla
Code Issues Proposed changes

Merge "Defer handling of /var/lib/neutron/kolla to kolla API"

Browse Source
This commit is contained in:
Jenkins 2017-04-10 10:10:36 +00:00 committed by Gerrit Code Review
commit 77903c70cd
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,12 +17,6 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(neutron_metadata_agent_packages | customizable("packages")) }} {{ macros.install_packages(neutron_metadata_agent_packages | customizable("packages")) }}
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/kolla_neutron_metadata_sudoers
{% block neutron_metadata_agent_footer %}{% endblock %} {% block neutron_metadata_agent_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}

6
docker/neutron/neutron-metadata-agent/extend_start.sh
View File

@ -1,6 +0,0 @@
#!/bin/bash
# Only update permissions if permissions need to be updated
if [[ $(stat -c %U:%G /var/lib/neutron/kolla) != "neutron:neutron" ]]; then
sudo chown neutron: /var/lib/neutron/kolla
fi

1
docker/neutron/neutron-metadata-agent/neutron_sudoers
View File

@ -1 +0,0 @@
%kolla ALL=(root) NOPASSWD: /bin/chown neutron\: /var/lib/neutron/kolla, /usr/bin/chown neutron\: /var/lib/neutron/kolla