Remove footer block and variable in *-base images

Change-Id: I39aa88489f744f779150695f3f55ef80d42e1c61
Closes-Bug: #1653247

docker/ceph/ceph-base/Dockerfile.j2

@@ -33,5 +33,3 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
     && usermod -a -G kolla ceph
 
 {% block ceph_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-{{ include_footer }}

docker/cinder/cinder-base/Dockerfile.j2

@@ -70,4 +70,3 @@ RUN usermod -a -G kolla cinder \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cinder_extend_start
 
 {% block cinder_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}

docker/congress/congress-base/Dockerfile.j2

@@ -42,5 +42,3 @@ RUN usermod -a -G kolla congress \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_congress_extend_start
 
 {% block congress_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-{{ include_footer }}

docker/designate/designate-base/Dockerfile.j2

@@ -58,4 +58,3 @@ RUN usermod -a -G kolla designate \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_designate_extend_start
 
 {% block designate_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}

docker/glance/glance-base/Dockerfile.j2

@@ -50,5 +50,3 @@ RUN usermod -a -G kolla glance \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_glance_extend_start
 
 {% block glance_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-{{ include_footer }}

docker/heat/heat-base/Dockerfile.j2

@@ -33,4 +33,3 @@ RUN usermod -a -G kolla heat \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_heat_extend_start
 
 {% block heat_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}

docker/keystone/keystone-base/Dockerfile.j2

@@ -77,5 +77,3 @@ RUN usermod -a -G kolla keystone \
     && chmod 755 /var/www/cgi-bin/keystone/*
 
 {% block keystone_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-{{ include_footer }}

docker/manila/manila-base/Dockerfile.j2

@@ -60,4 +60,3 @@ RUN touch /usr/local/bin/kolla_manila_extend_start \
 RUN usermod -a -G kolla manila
 
 {% block manila_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}

docker/murano/murano-base/Dockerfile.j2

@@ -36,4 +36,3 @@ RUN usermod -a -G kolla murano \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_murano_extend_start
 
 {% block murano_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}

docker/openstack-base/Dockerfile.j2

@@ -350,4 +350,3 @@ ENV PATH /var/lib/kolla/venv/bin:$PATH
 {% endif %}
 
 {% block openstack_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}

docker/openvswitch/openvswitch-base/Dockerfile.j2

@@ -20,4 +20,3 @@ RUN touch /usr/local/bin/kolla_openvswitch_extend_start \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start
 
 {% block openvswitch_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}

docker/searchlight/searchlight-base/Dockerfile.j2

@@ -27,4 +27,3 @@ RUN usermod -a -G kolla searchlight \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_searchlight_extend_start
 
 {% block searchlight_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}

docker/senlin/senlin-base/Dockerfile.j2

@@ -27,4 +27,3 @@ RUN usermod -a -G kolla senlin \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_senlin_extend_start
 
 {% block senlin_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}

docker/swift/swift-base/Dockerfile.j2

@@ -53,4 +53,3 @@ RUN mkdir -p /opt/swift
 RUN usermod -a -G kolla swift
 
 {% block swift_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}

docker/trove/trove-base/Dockerfile.j2

@@ -34,4 +34,3 @@ RUN usermod -a -G kolla trove \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_trove_extend_start
 
 {% block trove_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}

docker/watcher/watcher-base/Dockerfile.j2

@@ -29,5 +29,3 @@ RUN usermod -a -G kolla watcher \
     && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_watcher_extend_start
 
 {% block watcher_base_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-{{ include_footer }}