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

doc/CONTRIBUTING.rst

@@ -82,11 +82,7 @@ is as follows::
 
     {% block << service >>_footer %}{% endblock %}
     {% block footer %}{% endblock %}
-    {{ include_footer }}
 
 .. NOTE::
   The generic footer block ``{% block footer %}{% endblock %}`` should not be
   included in base images (e.g. glance-base).
-
-  {{ include_footer }} is legacy and should not be included in new services, it
-  is superseded by {% block footer %}{% endblock %}

docker/aodh/aodh-api/Dockerfile.j2

@@ -19,4 +19,3 @@ RUN chmod 755 /usr/local/bin/kolla_aodh_extend_start
 
 {% block aodh_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/aodh/aodh-evaluator/Dockerfile.j2

@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block aodh_evaluator_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER aodh

docker/aodh/aodh-expirer/Dockerfile.j2

@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block aodh_expirer_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER aodh

docker/aodh/aodh-listener/Dockerfile.j2

@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block aodh_listener_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER aodh

docker/aodh/aodh-notifier/Dockerfile.j2

@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block aodh_notifier_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER aodh

docker/base/Dockerfile.j2

@@ -14,7 +14,6 @@ LABEL kolla_version="{{ kolla_version }}"
 
 {% import "macros.j2" as macros with context %}
 {% block base_header %}{% endblock %}
-{{ include_header }}
 
 ENV KOLLA_BASE_DISTRO {{ base_distro }}
 ENV KOLLA_INSTALL_TYPE {{ install_type }}

docker/bifrost/bifrost-deploy/Dockerfile.j2

@@ -58,4 +58,3 @@ CMD [ "/sbin/init" ]
 
 {% block bifrost_deploy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/ceilometer/ceilometer-api/Dockerfile.j2

@@ -63,4 +63,3 @@ RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start
 
 {% block ceilometer_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/ceilometer/ceilometer-central/Dockerfile.j2

@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block ceilometer_central_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ceilometer

docker/ceilometer/ceilometer-collector/Dockerfile.j2

@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block ceilometer_collector_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ceilometer

docker/ceilometer/ceilometer-compute/Dockerfile.j2

@@ -38,7 +38,6 @@ RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements
 
 {% block ceilometer_compute_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 # NOTE(huikang): non-root user does not work with libvirt.sock.
 #                Need configuration in nova-libvirt container to allow

docker/ceilometer/ceilometer-notification/Dockerfile.j2

@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block ceilometer_notification_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ceilometer

docker/ceph/ceph-mon/Dockerfile.j2

@@ -10,4 +10,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/bin/fetch_ceph_keys.py
 
 {% block ceph_mon_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/ceph/ceph-osd/Dockerfile.j2

@@ -8,4 +8,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block ceph_osd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/ceph/ceph-rgw/Dockerfile.j2

@@ -5,4 +5,3 @@ MAINTAINER {{ maintainer }}
 
 {% block ceph_rgw_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/chrony/Dockerfile.j2

@@ -16,4 +16,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block chrony_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/cinder/cinder-api/Dockerfile.j2

@@ -55,6 +55,5 @@ RUN chmod 755 /usr/local/bin/kolla_cinder_extend_start
 
 {% block cinder_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER cinder

docker/cinder/cinder-backup/Dockerfile.j2

@@ -42,6 +42,5 @@ MAINTAINER {{ maintainer }}
 
 {% block cinder_backup_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER cinder

docker/cinder/cinder-scheduler/Dockerfile.j2

@@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }}
 
 {% block cinder_scheduler_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER cinder

docker/cinder/cinder-volume/Dockerfile.j2

@@ -53,6 +53,5 @@ RUN chmod 750 /etc/sudoers.d \
 
 {% block cinder_volume_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER cinder

docker/cloudkitty/cloudkitty-api/Dockerfile.j2

@@ -28,6 +28,5 @@ RUN chmod 755 /usr/local/bin/kolla_cloudkitty_extend_start
 
 {% block cloudkitty_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER cloudkitty

docker/cloudkitty/cloudkitty-processor/Dockerfile.j2

@@ -25,6 +25,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block cloudkitty_processor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER cloudkitty

docker/collectd/Dockerfile.j2

@@ -20,6 +20,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block collectd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER collectd

docker/congress/congress-api/Dockerfile.j2

@@ -8,6 +8,5 @@ RUN chmod 755 /usr/local/bin/kolla_congress_extend_start
 
 {% block congress_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER congress

docker/congress/congress-datasource/Dockerfile.j2

@@ -5,6 +5,5 @@ MAINTAINER {{ maintainer }}
 
 {% block congress_datasource_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER congress

docker/congress/congress-policy-engine/Dockerfile.j2

@@ -5,6 +5,5 @@ MAINTAINER {{ maintainer }}
 
 {% block congress_policy_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER congress

docker/cron/Dockerfile.j2

@@ -24,4 +24,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block cron_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/dind/Dockerfile.j2

@@ -27,4 +27,4 @@ COPY start.sh /usr/local/bin/kolla_start
 RUN chmod 755 /usr/local/bin/kolla_start
 
 {% block dind_footer %}{% endblock %}
-{{ include_footer }}
+{% block footer %}{% endblock %}

docker/elasticsearch/Dockerfile.j2

@@ -40,6 +40,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block elasticsearch_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER elasticsearch

docker/etcd/Dockerfile.j2

@@ -23,6 +23,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block etcd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER etcd

docker/fluentd/Dockerfile.j2

@@ -48,6 +48,5 @@ RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \
 
 {% block fluentd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER td-agent

docker/freezer/freezer-api/Dockerfile.j2

@@ -44,4 +44,3 @@ RUN chmod 755 /usr/local/bin/kolla_freezer_extend_start
 
 {% block freezer_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/glance/glance-api/Dockerfile.j2

@@ -18,6 +18,5 @@ RUN chmod 755 /usr/local/bin/kolla_glance_extend_start
 
 {% block glance_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER glance

docker/glance/glance-registry/Dockerfile.j2

@@ -5,6 +5,5 @@ MAINTAINER {{ maintainer }}
 
 {% block glance_registry_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER glance

docker/gnocchi/gnocchi-api/Dockerfile.j2

@@ -23,4 +23,3 @@ RUN chmod 755 /usr/local/bin/kolla_gnocchi_extend_start
 
 {% block gnocchi_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/gnocchi/gnocchi-metricd/Dockerfile.j2

@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block gnocchi_metricd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER gnocchi

docker/gnocchi/gnocchi-statsd/Dockerfile.j2

@@ -15,6 +15,4 @@ MAINTAINER {{ maintainer }}
 {% block gnocchi_statsd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER gnocchi

docker/grafana/Dockerfile.j2

@@ -22,6 +22,5 @@ RUN grafana-cli plugins install sileht-gnocchi-datasource \
 
 {% block grafana_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER grafana

docker/haproxy/Dockerfile.j2

@@ -25,4 +25,3 @@ RUN chmod 755 /usr/local/bin/kolla_ensure_haproxy_latest_config
 
 {% block haproxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/heat/heat-api-cfn/Dockerfile.j2

@@ -16,6 +16,5 @@ MAINTAINER {{ maintainer }}
 
 {% block heat_api_cfn_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER heat

docker/heat/heat-api/Dockerfile.j2

@@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_heat_extend_start
 
 {% block heat_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER heat

docker/heat/heat-engine/Dockerfile.j2

@@ -21,6 +21,4 @@ MAINTAINER {{ maintainer }}
 {% block heat_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER heat

docker/heka/Dockerfile.j2

@@ -34,6 +34,5 @@ RUN chmod 440 /etc/sudoers.d/kolla_heka_sudoers \
 
 {% block heka_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER heka

docker/horizon/Dockerfile.j2

@@ -128,4 +128,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block horizon_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/influxdb/Dockerfile.j2

@@ -19,6 +19,5 @@ RUN chmod 750 /etc/sudoers.d \
 
 {% block influxdb_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER influxdb

docker/ironic/ironic-api/Dockerfile.j2

@@ -21,6 +21,5 @@ RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start
 
 {% block ironic_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ironic

docker/ironic/ironic-conductor/Dockerfile.j2

@@ -78,6 +78,5 @@ RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements
 
 {% block ironic_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ironic

docker/ironic/ironic-inspector/Dockerfile.j2

@@ -43,6 +43,5 @@ RUN chmod 750 /etc/sudoers.d \
 
 {% block ironic_inspector_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ironic

docker/ironic/ironic-pxe/Dockerfile.j2

@@ -33,4 +33,3 @@ RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start
 
 {% block ironic_pxe_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/iscsid/Dockerfile.j2

@@ -29,4 +29,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block iscsid_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/karbor/karbor-api/Dockerfile.j2

@@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_karbor_extend_start
 
 {% block karbor_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER karbor

docker/karbor/karbor-operationengine/Dockerfile.j2

@@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block karbor_operationengine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER karbor

docker/karbor/karbor-protection/Dockerfile.j2

@@ -12,6 +12,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block karbor_protection_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER karbor

docker/keepalived/Dockerfile.j2

@@ -26,4 +26,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /check_alive.sh
 
 {% block keepalived_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/keystone/keystone-fernet/Dockerfile.j2

@@ -27,4 +27,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo
 
 {% block keystone_fernet_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/keystone/keystone-ssh/Dockerfile.j2

@@ -29,4 +29,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block keystone_ssh_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/keystone/keystone/Dockerfile.j2

@@ -13,4 +13,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo
 
 {% block keystone_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/kibana/Dockerfile.j2

@@ -15,6 +15,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block kibana_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER kibana

docker/kolla-toolbox/Dockerfile.j2

@@ -76,6 +76,5 @@ RUN chmod 440 /etc/sudoers.d/kolla_ansible_sudoers
 
 {% block kolla_toolbox_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER ansible

docker/kubetoolbox/Dockerfile.j2

@@ -18,4 +18,3 @@ RUN curl -o /usr/bin/kubectl http://storage.googleapis.com/kubernetes-release/re
 
 {% block kubetoolbox_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/kuryr/kuryr-libnetwork/Dockerfile.j2

@@ -18,4 +18,3 @@ RUN ln -s kuryr-libnetwork-source/* kuryr-libnetwork \
 
 {% block kuryr_libnetwork_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/magnum/magnum-api/Dockerfile.j2

@@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_magnum_extend_start
 
 {% block magnum_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER magnum

docker/magnum/magnum-conductor/Dockerfile.j2

@@ -27,6 +27,5 @@ RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-re
 
 {% block magnum_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER magnum

docker/manila/manila-api/Dockerfile.j2

@@ -22,6 +22,5 @@ RUN chmod 755 /usr/local/bin/kolla_manila_extend_start
 
 {% block manila_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER manila

docker/manila/manila-data/Dockerfile.j2

@@ -40,6 +40,5 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
 {% block manila_data_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER manila

docker/manila/manila-scheduler/Dockerfile.j2

@@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }}
 
 {% block manila_scheduler_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER manila

docker/manila/manila-share/Dockerfile.j2

@@ -19,6 +19,5 @@ MAINTAINER {{ maintainer }}
 
 {% block manila_share_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER manila

docker/mariadb/Dockerfile.j2

@@ -41,6 +41,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block mariadb_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER mysql

docker/memcached/Dockerfile.j2

@@ -12,6 +12,5 @@ MAINTAINER {{ maintainer }}
 
 {% block memcached_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER memcached

docker/mistral/mistral-api/Dockerfile.j2

@@ -19,6 +19,5 @@ RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start
 
 {% block mistral_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER mistral

docker/mistral/mistral-engine/Dockerfile.j2

@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block mistral_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER mistral

docker/mistral/mistral-executor/Dockerfile.j2

@@ -17,6 +17,4 @@ MAINTAINER {{ maintainer }}
 {% block mistral_executor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
-{{ include_footer }}
-
 USER mistral

docker/mongodb/Dockerfile.j2

@@ -29,6 +29,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block mongodb_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER mongodb

docker/multipathd/Dockerfile.j2

@@ -15,4 +15,3 @@ MAINTAINER {{ maintainer }}
 
 {% block multipathd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/murano/murano-api/Dockerfile.j2

@@ -23,6 +23,5 @@ RUN chmod 755 /usr/local/bin/kolla_murano_extend_start
 
 {% block murano_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER murano

docker/murano/murano-engine/Dockerfile.j2

@@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }}
 
 {% block murano_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER murano

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

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

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

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

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

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

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

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

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

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

docker/nova/nova-api/Dockerfile.j2

@@ -53,6 +53,5 @@ RUN chmod 755 /usr/local/bin/kolla_nova_extend_start
 
 {% block nova_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova

docker/nova/nova-compute-ironic/Dockerfile.j2

@@ -29,6 +29,5 @@ RUN rm /etc/nova/nova-compute.conf
 
 {% block nova_compute_ironic_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova

docker/nova/nova-compute/Dockerfile.j2

@@ -96,6 +96,5 @@ ENV PATH $PATH:/lib/udev
 
 {% block nova_compute_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova

docker/nova/nova-conductor/Dockerfile.j2

@@ -26,6 +26,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova

docker/nova/nova-consoleauth/Dockerfile.j2

@@ -27,6 +27,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_consoleauth_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova

docker/nova/nova-libvirt/Dockerfile.j2

@@ -64,4 +64,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block nova_libvirt_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/nova/nova-novncproxy/Dockerfile.j2

@@ -33,6 +33,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_novncproxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova

docker/nova/nova-scheduler/Dockerfile.j2

@@ -26,6 +26,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_scheduler_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova

docker/nova/nova-serialproxy/Dockerfile.j2

@@ -22,6 +22,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_serialproxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova

docker/nova/nova-spicehtml5proxy/Dockerfile.j2

@@ -45,6 +45,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_spicehtml5proxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova

docker/nova/nova-ssh/Dockerfile.j2

@@ -26,4 +26,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {% block nova_ssh_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/openvswitch/openvswitch-db-server/Dockerfile.j2

@@ -12,4 +12,3 @@ RUN chmod 755 /usr/local/bin/kolla_ensure_openvswitch_configured \
 
 {% block openvswitch_db_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}

docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2

@@ -8,4 +8,3 @@ RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start
 
 {% block openvswitch_vswitchd_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}