diff options
| author | Jeff Peeler <jpeeler@redhat.com> | 2015-10-07 13:30:01 -0400 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@redhat.com> | 2015-10-07 13:33:19 -0400 |
| commit | 717ed63b5605ae0f0f55a1449b517041fb417a17 (patch) | |
| tree | 42dcbf3a2d3d36d4cee7817dfe333d4daeeac506 /docker | |
| parent | f6107f0929cd4162d00cf47047b4c724d5e45d4a (diff) | |
| download | kolla-717ed63b5605ae0f0f55a1449b517041fb417a17.tar.gz kolla-717ed63b5605ae0f0f55a1449b517041fb417a17.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-api/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | 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 6b726a419..6a7b6975f 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 1a0976312..a28ea2ebc 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 %} |