From e5903d5fa9ef545595f7e98b73eb3bb31b72b4bb Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 2 Feb 2017 15:22:36 +0800 Subject: Remove include_header and include_footer in all Dockerfiles include_header and include_footer parameter is already removed, remove them in all Dockerfiles. Add missing footer block. Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3 --- docker/neutron/neutron-dhcp-agent/Dockerfile.j2 | 1 - docker/neutron/neutron-l3-agent/Dockerfile.j2 | 1 - docker/neutron/neutron-lbaas-agent/Dockerfile.j2 | 1 - docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 1 - docker/neutron/neutron-metadata-agent/Dockerfile.j2 | 1 - docker/neutron/neutron-metering-agent/Dockerfile.j2 | 1 - docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 1 - docker/neutron/neutron-server/Dockerfile.j2 | 1 - docker/neutron/neutron-sfc-agent/Dockerfile.j2 | 1 - docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 | 1 - 10 files changed, 10 deletions(-) (limited to 'docker/neutron') diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 index 497f22002..c49919238 100644 --- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 @@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }} {% block neutron_dhcp_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2 index 322d0817a..96f2a0eca 100644 --- a/docker/neutron/neutron-l3-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-l3-agent/Dockerfile.j2 @@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }} {% block neutron_l3_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 index 904671231..b84b498e7 100644 --- a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 @@ -45,6 +45,5 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start {% block neutron_lbaas_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index 010c312d0..5f894d26c 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -35,6 +35,5 @@ MAINTAINER {{ maintainer }} {% block neutron_linuxbridge_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 87269f58f..97685abf6 100644 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 @@ -25,6 +25,5 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start \ {% block neutron_metadata_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/docker/neutron/neutron-metering-agent/Dockerfile.j2 index b0133aaf6..dcdf8f240 100644 --- a/docker/neutron/neutron-metering-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metering-agent/Dockerfile.j2 @@ -20,6 +20,5 @@ MAINTAINER {{ maintainer }} {% block neutron_metering_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index d41f71a8b..1a3c52875 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -27,6 +27,5 @@ MAINTAINER {{ maintainer }} {% block neutron_openvswitch_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 1fee58600..dd6d03bf3 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -35,6 +35,5 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start \ {% block neutron_server_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 index a2daf90d0..cdd0b555c 100644 --- a/docker/neutron/neutron-sfc-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-sfc-agent/Dockerfile.j2 @@ -21,6 +21,5 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start {% block neutron_sfc_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER neutron diff --git a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 index f60c096a2..c995cee0e 100644 --- a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 @@ -46,7 +46,6 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start {% block neutron_vpnaas_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} # TODO(pbourke): The libreswan driver required by redhat derived bases # currently requires root in Neutron. Remove this if condition once -- cgit v1.2.3