diff options
| author | caowei <cao.wei@99cloud.net> | 2016-09-19 16:41:29 +0800 |
|---|---|---|
| committer | caowei <cao.wei@99cloud.net> | 2016-09-19 19:10:51 +0800 |
| commit | fec6382d2d8bd25662e2dbcad4b77d979d80c162 (patch) | |
| tree | a1acfd6d44f42e0c23b368b07b333811f3bcc239 | |
| parent | 42358d359b1e0c939f3f16cc0eb894b63e899d1f (diff) | |
| download | kolla-fec6382d2d8bd25662e2dbcad4b77d979d80c162.tar.gz kolla-fec6382d2d8bd25662e2dbcad4b77d979d80c162.zip | |
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
| -rw-r--r-- | docker/ironic/ironic-api/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/ironic/ironic-inspector/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 1 |
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 }} |