diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-10 10:10:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-10 10:10:36 +0000 |
| commit | 77903c70cd651ad97a6a918f6889e5120d85b8d1 (patch) | |
| tree | 7b4c1498729b6763423d7225903add8b33ad937b | |
| parent | d0b4896436379375bdc59da4da4a90fc3fe461a1 (diff) | |
| parent | 0c6f5d20747ab875daee4d0e4d1d1aa94224a4f9 (diff) | |
| download | kolla-77903c70cd651ad97a6a918f6889e5120d85b8d1.tar.gz kolla-77903c70cd651ad97a6a918f6889e5120d85b8d1.zip | |
Merge "Defer handling of /var/lib/neutron/kolla to kolla API"
| -rw-r--r-- | docker/neutron/neutron-metadata-agent/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/neutron/neutron-metadata-agent/extend_start.sh | 6 | ||||
| -rw-r--r-- | docker/neutron/neutron-metadata-agent/neutron_sudoers | 1 |
3 files changed, 0 insertions, 13 deletions
diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 1dca933d5..80f7fb4a6 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 c46f60f55..000000000 --- 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 17b8b3dee..000000000 --- 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 |