From fec6382d2d8bd25662e2dbcad4b77d979d80c162 Mon Sep 17 00:00:00 2001
From: caowei <cao.wei@99cloud.net>
Date: Mon, 19 Sep 2016 16:41:29 +0800
Subject: [PATCH] Fix ironic Dockerfile
1.Change "ironic_base" to "ironic_inspector" in ironic-inspector Dockerfile
2.add {% block footer %}{% endblock %}
TrivialFix
Closes-Bug: #1625131
Change-Id: Ibd02676e91a9b00cb1a46e7d00eaa3ab2c6c6412
---
docker/ironic/ironic-api/Dockerfile.j2 | 1 +
docker/ironic/ironic-conductor/Dockerfile.j2 | 1 +
docker/ironic/ironic-inspector/Dockerfile.j2 | 3 ++-
docker/ironic/ironic-pxe/Dockerfile.j2 | 1 +
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index 3f9d133596..eada8e359e 100644
--- a/docker/ironic/ironic-api/Dockerfile.j2
+++ b/docker/ironic/ironic-api/Dockerfile.j2
@@ -20,6 +20,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_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 c919027b27..69196958c4 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -35,6 +35,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(ironic_conductor_packages | customizable("packages")) }}
{% 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 3c79d38159..862b946d80 100644
--- a/docker/ironic/ironic-inspector/Dockerfile.j2
+++ b/docker/ironic/ironic-inspector/Dockerfile.j2
@@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set ironic_inspector_packages = ['openstack-ironic-inspector'] %}
{% elif base_distro in ['ubuntu'] %}
- {% set ironic_base_packages = ['ironic-inspector'] %}
+ {% set ironic_inspector_packages = ['ironic-inspector'] %}
{% endif %}
{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
@@ -20,6 +20,7 @@ RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements
{% endif %}
{% 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 cac474faa4..4f3692b5f5 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/docker/ironic/ironic-pxe/Dockerfile.j2
@@ -25,4 +25,5 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
{% block ironic_pxe_footer %}{% endblock %}
+{% block footer %}{% endblock %}
{{ include_footer }}