openstack/kolla-ansible
Code Issues Proposed changes

Fix ironic Dockerfile

Browse Source 
1.Change "ironic_base" to "ironic_inspector" in ironic-inspector Dockerfile
2.add {% block footer %}{% endblock %}
TrivialFix

Closes-Bug: #1625131
Change-Id: Ibd02676e91a9b00cb1a46e7d00eaa3ab2c6c6412
This commit is contained in:
caowei 2016-09-19 16:41:29 +08:00
parent 42358d359b
commit fec6382d2d
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/ironic/ironic-api/Dockerfile.j2
View File

@ -20,6 +20,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start
{% block ironic_api_footer %}{% endblock %} {% block ironic_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER ironic USER ironic

1
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -35,6 +35,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(ironic_conductor_packages | customizable("packages")) }} {{ macros.install_packages(ironic_conductor_packages | customizable("packages")) }}
{% block ironic_conductor_footer %}{% endblock %} {% block ironic_conductor_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER ironic USER ironic

3
docker/ironic/ironic-inspector/Dockerfile.j2
View File

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set ironic_inspector_packages = ['openstack-ironic-inspector'] %} {% set ironic_inspector_packages = ['openstack-ironic-inspector'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set ironic_base_packages = ['ironic-inspector'] %} {% set ironic_inspector_packages = ['ironic-inspector'] %}
{% endif %} {% endif %}
{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }} {{ 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 %} {% endif %}
{% block ironic_inspector_footer %}{% endblock %} {% block ironic_inspector_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER ironic USER ironic

1
docker/ironic/ironic-pxe/Dockerfile.j2
View File

@ -25,4 +25,5 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start
{% block ironic_pxe_footer %}{% endblock %} {% block ironic_pxe_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}