From febcb600f122dc644f8a05c4a7697a39e9157834 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <mrostecki@mirantis.com>
Date: Wed, 18 Nov 2015 07:22:17 +0100
Subject: 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
---
 docker/nova/nova-base/Dockerfile.j2    | 2 +-
 docker/nova/nova-compute/Dockerfile.j2 | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'docker/nova')

diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index baeda4025..4b2fea8b4 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -36,7 +36,7 @@ RUN apt-get install -y --no-install-recommends \
 ADD nova-base-archive /nova-base-source
 RUN ln -s nova-base-source/* nova \
     && useradd --user-group nova \
-    && pip --no-cache-dir install /nova \
+    && /var/lib/kolla/venv/bin/pip --no-cache-dir install /nova \
     && mkdir -p /etc/nova /var/log/nova /home/nova \
     && cp -r /nova/etc/nova/* /etc/nova/ \
     && chown -R nova: /etc/nova /var/log/nova /home/nova
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 41b2e0183..90dd8de2e 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -15,9 +15,8 @@ RUN yum -y install \
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN pip uninstall -y requests \
-    && yum -y install \
-        libvirt-python \
+RUN yum -y install \
+        libvirt-devel \
         openvswitch \
         qemu-img \
         sysfsutils \
@@ -27,12 +26,16 @@ RUN pip uninstall -y requests \
     {% elif base_distro in ['ubuntu', 'debian'] %}
 
 RUN apt-get install -y --no-install-recommends \
+        libvirt-dev \
         qemu-utils \
         ceph-common \
     && apt-get clean \
     && mkdir -p /etc/ceph
 
     {% endif %}
+
+RUN /var/lib/kolla/venv/bin/pip install --no-cache-dir libvirt-python
+
 {% endif %}
 
 {{ include_footer }}
-- 
cgit v1.2.3