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/ceph/ceph-mon/Dockerfile.j2 | 1 - docker/ceph/ceph-osd/Dockerfile.j2 | 1 - docker/ceph/ceph-rgw/Dockerfile.j2 | 1 - 3 files changed, 3 deletions(-) (limited to 'docker/ceph') diff --git a/docker/ceph/ceph-mon/Dockerfile.j2 b/docker/ceph/ceph-mon/Dockerfile.j2 index 0627eff00..06ff6bfd4 100644 --- a/docker/ceph/ceph-mon/Dockerfile.j2 +++ b/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 }} diff --git a/docker/ceph/ceph-osd/Dockerfile.j2 b/docker/ceph/ceph-osd/Dockerfile.j2 index 3f38fd016..a521189df 100644 --- a/docker/ceph/ceph-osd/Dockerfile.j2 +++ b/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 }} diff --git a/docker/ceph/ceph-rgw/Dockerfile.j2 b/docker/ceph/ceph-rgw/Dockerfile.j2 index 721bd8f05..156ba4956 100644 --- a/docker/ceph/ceph-rgw/Dockerfile.j2 +++ b/docker/ceph/ceph-rgw/Dockerfile.j2 @@ -5,4 +5,3 @@ MAINTAINER {{ maintainer }} {% block ceph_rgw_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} -- cgit v1.2.3