diff options
| author | Michal Rostecki <mrostecki@mirantis.com> | 2015-11-18 07:22:17 +0100 |
|---|---|---|
| committer | Michal Rostecki <mrostecki@mirantis.com> | 2015-11-27 10:22:17 +0100 |
| commit | febcb600f122dc644f8a05c4a7697a39e9157834 (patch) | |
| tree | e7cdc8485f7613dc8c52a85d0a252c7c24a9d03e /docker/ironic | |
| parent | 563b56126991cfc2f3378f803e071ad79aca3487 (diff) | |
| download | kolla-febcb600f122dc644f8a05c4a7697a39e9157834.tar.gz kolla-febcb600f122dc644f8a05c4a7697a39e9157834.zip | |
Source installation in virtualenv
Use virtualenv for installation of OpenStack projects and
dependencies to avoid conflicts with Python libraries installed
by non-OpenStack binary packages.
Change-Id: I21ecd673b2e93335b1d3dd4e279e940c9d694c3c
Implements: blueprint virtualenv
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 109afed56..45f1f97cb 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 \ - && pip --no-cache-dir install -c requirements/upper-constraints.txt /ironic \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install -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 536d2b878..bf4817a86 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 pip install ironic-discoverd +RUN /var/lib/kolla/venv/bin/pip install ironic-discoverd # discoverd no longer in delorean 9/28/2015, switch to inspector on TODO #RUN yum -y install \ # openstack-ironic-discoverd \ |