From 3391a328026c19119d1d192718203a39330bdbec Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Thu, 15 Oct 2015 11:07:08 +0100
Subject: [PATCH] Use openstack/requirements for ironic
See Iccb4e99f8e4b6659a19c1817d0f4c697824af25c for context.
Change-Id: I9fbfa7ca442063db52c8b14586176ab994d2cf46
Partial-Bug: #150530
---
docker/ironic/ironic-base/Dockerfile.j2 | 2 +-
docker/ironic/ironic-discoverd/Dockerfile.j2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2
index bb05d2dd75..351d7a0e93 100644
--- a/docker/ironic/ironic-base/Dockerfile.j2
+++ b/docker/ironic/ironic-base/Dockerfile.j2
@@ -19,7 +19,7 @@ RUN yum -y install \
ADD ironic-base-archive /ironic-base-source
RUN ln -s ironic-base-source/* ironic \
&& useradd --user-group ironic \
- && pip --no-cache-dir install /ironic \
+ && pip --no-cache-dir install -c requirements/upper-constraints.txt /ironic \
&& mkdir -p /etc/ironic /var/log/ironic /home/ironic \
&& cp -r /ironic/etc/* /etc/ironic/ \
&& chown -R ironic: /etc/ironic /var/log/ironic /home/ironic
diff --git a/docker/ironic/ironic-discoverd/Dockerfile.j2 b/docker/ironic/ironic-discoverd/Dockerfile.j2
index f666eb6f09..a536979791 100644
--- a/docker/ironic/ironic-discoverd/Dockerfile.j2
+++ b/docker/ironic/ironic-discoverd/Dockerfile.j2
@@ -4,7 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN pip install ironic-discoverd
+RUN pip install -c requirements/upper-constraints.txt ironic-discoverd
# discoverd no longer in delorean 9/28/2015, switch to inspector on TODO
#RUN yum -y install \
# openstack-ironic-discoverd \