diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 1dca933d57..80f7fb4a69 100644 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 @@ -17,12 +17,6 @@ MAINTAINER {{ maintainer }} {{ 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 footer %}{% endblock %} diff --git a/docker/neutron/neutron-metadata-agent/extend_start.sh b/docker/neutron/neutron-metadata-agent/extend_start.sh deleted file mode 100644 index c46f60f555..0000000000 --- a/docker/neutron/neutron-metadata-agent/extend_start.sh +++ /dev/null @@ -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 diff --git a/docker/neutron/neutron-metadata-agent/neutron_sudoers b/docker/neutron/neutron-metadata-agent/neutron_sudoers deleted file mode 100644 index 17b8b3dee2..0000000000 --- a/docker/neutron/neutron-metadata-agent/neutron_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /bin/chown neutron\: /var/lib/neutron/kolla, /usr/bin/chown neutron\: /var/lib/neutron/kolla