diff options
| author | SamYaple <sam@yaple.net> | 2015-12-27 02:41:30 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2015-12-27 03:35:35 +0000 |
| commit | cda0459ad1c6c51ec5de3bd4492c96e1db48c4d7 (patch) | |
| tree | 6479fa1fe24ec8adf078253ff95b34b136dda9dc /docker/ironic | |
| parent | 44576361670deadfed68f5d516524d95e54461d5 (diff) | |
| download | kolla-cda0459ad1c6c51ec5de3bd4492c96e1db48c4d7.tar.gz kolla-cda0459ad1c6c51ec5de3bd4492c96e1db48c4d7.zip | |
Fix pip install settings
There were some inconsistencies with pip install instructions
thoughout Kolla. We fix those here.
Additionally, we fix the virtualenv to properly use the site-packages
on the host if a library is not available in the venv.
Change-Id: Ib84d48e8826bb96060338b3fa0782620c98794a8
Related-Bug: #1524684
Closes-Bug: #1529434
Diffstat (limited to 'docker/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 45f1f97cb..1c6aaa49d 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -20,7 +20,7 @@ RUN yum -y install \ ADD ironic-base-archive /ironic-base-source RUN ln -s ironic-base-source/* ironic \ && useradd --user-group ironic \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /ironic \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /ironic \ && mkdir -p /etc/ironic /var/log/ironic /home/ironic \ && cp -r /ironic/etc/ironic/* /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 bf4817a86..536d2b878 100644 --- a/docker/ironic/ironic-discoverd/Dockerfile.j2 +++ b/docker/ironic/ironic-discoverd/Dockerfile.j2 @@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN /var/lib/kolla/venv/bin/pip install ironic-discoverd +RUN pip install ironic-discoverd # discoverd no longer in delorean 9/28/2015, switch to inspector on TODO #RUN yum -y install \ # openstack-ironic-discoverd \ |