From 0c6f5d20747ab875daee4d0e4d1d1aa94224a4f9 Mon Sep 17 00:00:00 2001 From: Martin André Date: Thu, 2 Mar 2017 13:43:04 +0100 Subject: Defer handling of /var/lib/neutron/kolla to kolla API neutron-metadata-agent image expected the /var/lib/neutron/kolla directory to be present but it was not created as part of the image building. As a result, the extend_start.sh script fails with: stat: cannot stat '/var/lib/neutron/kolla': No such file or directory This commit defers setting the right ownership for files and directories to the kolla config API via a config.json file. Kolla-ansible already mounts the directory as the neutron_metadata_socket named volume and uses kolla API to set the ownership and permissions [1]. [1] https://github.com/openstack/kolla-ansible/blob/master/ansible/roles/neutron/templates/neutron-metadata-agent.json.j2 Closes-Bug: #1669487 Change-Id: Ib521b0fc69ab6a72295a2fde3309a001bc3063c2 --- docker/neutron/neutron-metadata-agent/Dockerfile.j2 | 6 ------ docker/neutron/neutron-metadata-agent/extend_start.sh | 6 ------ docker/neutron/neutron-metadata-agent/neutron_sudoers | 1 - 3 files changed, 13 deletions(-) delete mode 100644 docker/neutron/neutron-metadata-agent/extend_start.sh delete mode 100644 docker/neutron/neutron-metadata-agent/neutron_sudoers (limited to 'docker') diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 97685abf6..1c34b8a7a 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 -- cgit v1.2.3