From 717ed63b5605ae0f0f55a1449b517041fb417a17 Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@redhat.com>
Date: Wed, 7 Oct 2015 13:30:01 -0400
Subject: [PATCH] Fix up ironic Dockerfiles to build
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
---
docker/ironic/ironic-api/Dockerfile.j2 | 5 +----
docker/ironic/ironic-conductor/Dockerfile.j2 | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index 6b726a4198..6a7b6975f5 100644
--- a/docker/ironic/ironic-api/Dockerfile.j2
+++ b/docker/ironic/ironic-api/Dockerfile.j2
@@ -4,10 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-# Install delorean version even though version number is less
-# 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 \
+RUN yum -y install openstack-ironic-api \
&& yum clean all
{% endif %}
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index 1a09763122..a28ea2ebc9 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -4,10 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-# Install delorean version even though version number is less
-# 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 \
+RUN yum -y install openstack-ironic-conductor \
&& yum clean all
{% endif %}
--
GitLab