From e5903d5fa9ef545595f7e98b73eb3bb31b72b4bb Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
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/nova/nova-api/Dockerfile.j2             | 1 -
 docker/nova/nova-compute-ironic/Dockerfile.j2  | 1 -
 docker/nova/nova-compute/Dockerfile.j2         | 1 -
 docker/nova/nova-conductor/Dockerfile.j2       | 1 -
 docker/nova/nova-consoleauth/Dockerfile.j2     | 1 -
 docker/nova/nova-libvirt/Dockerfile.j2         | 1 -
 docker/nova/nova-novncproxy/Dockerfile.j2      | 1 -
 docker/nova/nova-scheduler/Dockerfile.j2       | 1 -
 docker/nova/nova-serialproxy/Dockerfile.j2     | 1 -
 docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 1 -
 docker/nova/nova-ssh/Dockerfile.j2             | 1 -
 11 files changed, 11 deletions(-)

(limited to 'docker/nova')

diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
index 7c8436fd0..0e9eeb124 100644
--- a/docker/nova/nova-api/Dockerfile.j2
+++ b/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
diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2
index 1fd22cef8..65fe986f9 100644
--- a/docker/nova/nova-compute-ironic/Dockerfile.j2
+++ b/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
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 3962ad046..0304c7954 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/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
diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2
index ebb61a67a..95d56b394 100644
--- a/docker/nova/nova-conductor/Dockerfile.j2
+++ b/docker/nova/nova-conductor/Dockerfile.j2
@@ -26,6 +26,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_conductor_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2
index e5a8ad5c4..d87009a26 100644
--- a/docker/nova/nova-consoleauth/Dockerfile.j2
+++ b/docker/nova/nova-consoleauth/Dockerfile.j2
@@ -27,6 +27,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_consoleauth_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 813b97128..079711a05 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/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 }}
diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2
index 19a861458..aa8a5dde5 100644
--- a/docker/nova/nova-novncproxy/Dockerfile.j2
+++ b/docker/nova/nova-novncproxy/Dockerfile.j2
@@ -33,6 +33,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_novncproxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2
index edd49883c..c17c46fd4 100644
--- a/docker/nova/nova-scheduler/Dockerfile.j2
+++ b/docker/nova/nova-scheduler/Dockerfile.j2
@@ -26,6 +26,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_scheduler_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/docker/nova/nova-serialproxy/Dockerfile.j2
index 025a888a1..1d29b3165 100644
--- a/docker/nova/nova-serialproxy/Dockerfile.j2
+++ b/docker/nova/nova-serialproxy/Dockerfile.j2
@@ -22,6 +22,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_serialproxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
index 913d33e45..edd014dfa 100644
--- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
+++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
@@ -45,6 +45,5 @@ MAINTAINER {{ maintainer }}
 
 {% block nova_spicehtml5proxy_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER nova
diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2
index 3b4ded412..98bee70f1 100644
--- a/docker/nova/nova-ssh/Dockerfile.j2
+++ b/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 }}
-- 
cgit v1.2.3