aboutsummaryrefslogtreecommitdiff
path: root/docker/ironic
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-07 14:56:26 +0000
committerGerrit Code Review <review@openstack.org>2017-02-07 14:56:26 +0000
commitb43efe5377e60328183bf567504fc7b9ae9cbdeb (patch)
tree537e8edb1d063778898e82d352f96824e001fb60 /docker/ironic
parent40130b2e7a591931ddac366dc6f8d085e1f83e37 (diff)
parente5903d5fa9ef545595f7e98b73eb3bb31b72b4bb (diff)
downloadkolla-b43efe5377e60328183bf567504fc7b9ae9cbdeb.tar.gz
kolla-b43efe5377e60328183bf567504fc7b9ae9cbdeb.zip
Merge "Remove include_header and include_footer in all Dockerfiles"
Diffstat (limited to 'docker/ironic')
-rw-r--r--docker/ironic/ironic-api/Dockerfile.j21
-rw-r--r--docker/ironic/ironic-conductor/Dockerfile.j21
-rw-r--r--docker/ironic/ironic-inspector/Dockerfile.j21
-rw-r--r--docker/ironic/ironic-pxe/Dockerfile.j21
4 files changed, 0 insertions, 4 deletions
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index 1fd82dcfa..9ff62d23b 100644
--- a/docker/ironic/ironic-api/Dockerfile.j2
+++ b/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
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index f97e0e475..5841c3901 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/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
diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2
index 3eae4dab3..d659eb7ff 100644
--- a/docker/ironic/ironic-inspector/Dockerfile.j2
+++ b/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
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2
index accfeaff2..7540b536a 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/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 }}