diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-15 15:01:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-15 15:01:00 +0000 |
| commit | f2182332909d670e4f9bf4f0661e042a8c35dcb0 (patch) | |
| tree | 2df4eab1f08bf76431c303337350bbd020850827 | |
| parent | dace19bef32e33ed3d88855e5405632d6ae535a9 (diff) | |
| parent | 3391a328026c19119d1d192718203a39330bdbec (diff) | |
| download | kolla-f2182332909d670e4f9bf4f0661e042a8c35dcb0.tar.gz kolla-f2182332909d670e4f9bf4f0661e042a8c35dcb0.zip | |
Merge "Use openstack/requirements for ironic"
| -rw-r--r-- | docker/ironic/ironic-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | 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 bb05d2dd7..351d7a0e9 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 f666eb6f0..a53697979 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 \ |