Merge "Fix ironic Dockerfile"

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

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

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

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 }}