openstack/kolla-ansible
Code Issues Proposed changes

Fix up ironic Dockerfiles to build

Browse Source 
The dockerfiles for each of these containers were hacked to force
install the most recent version of the package, even though the newer
version had a lower version number. Delorean has fixed the issue by
bumping the epoch, so the hack is no longer required.

backport: liberty

Change-Id: I8d9c071d84e53280d3cadfceb9034bb96f64f3a3
Closes-bug: #1503785
This commit is contained in:
Jeff Peeler 2015-10-07 13:30:01 -04:00
parent f6107f0929
commit 717ed63b56
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,10 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
# Install delorean version even though version number is less RUN yum -y install openstack-ironic-api \
# http://lists.openstack.org/pipermail/openstack-dev/2015-August/073100.html
RUN VER_TO_GET=$(yum --showduplicates list openstack-ironic-api | awk '/delorean/ {print $2}') \
&& yum -y install openstack-ironic-api-$VER_TO_GET \
&& yum clean all && yum clean all
{% endif %} {% endif %}

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

@ -4,10 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
# Install delorean version even though version number is less RUN yum -y install openstack-ironic-conductor \
# http://lists.openstack.org/pipermail/openstack-dev/2015-August/073100.html
RUN VER_TO_GET=$(yum --showduplicates list openstack-ironic-conductor | awk '/delorean/ {print $2}') \
&& yum -y install openstack-ironic-conductor-$VER_TO_GET \
&& yum clean all && yum clean all
{% endif %} {% endif %}