aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-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.j23
-rw-r--r--docker/ironic/ironic-pxe/Dockerfile.j21
4 files changed, 5 insertions, 1 deletions
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index 3f9d13359..eada8e359 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 c919027b2..69196958c 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 3c79d3815..862b946d8 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 cac474faa..4f3692b5f 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 }}