From dd34d885db425bfba651e59d3b311807172a8351 Mon Sep 17 00:00:00 2001 From: Proskurin Kirill Date: Tue, 21 Feb 2017 14:06:48 +0000 Subject: [PATCH] Fix for the build Change-Id: I54c26b588f68d6cf3a3151c448f98486a22d8c26 --- docker/nova-compute/Dockerfile.j2 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/nova-compute/Dockerfile.j2 b/docker/nova-compute/Dockerfile.j2 index 06d33b0..b530e09 100644 --- a/docker/nova-compute/Dockerfile.j2 +++ b/docker/nova-compute/Dockerfile.j2 @@ -12,6 +12,7 @@ RUN apt-get update \ && apt-get -y install libvirt-daemon -t testing --no-install-recommends \ libvirt-dev \ && apt-get -y install --no-install-recommends \ + python-dev \ genisoimage \ open-iscsi \ dosfstools \ @@ -21,13 +22,12 @@ RUN apt-get update \ && ln -s /usr/lib/python2.7/dist-packages/rados.x86_64-linux-gnu.so /var/lib/microservices/venv/local/lib/python2.7/site-packages/rados.x86_64-linux-gnu.so \ && ln -s /usr/lib/python2.7/dist-packages/rados-0.egg-info /var/lib/microservices/venv/local/lib/python2.7/site-packages/rados-0.egg-info \ && ln -s /usr/lib/python2.7/dist-packages/rbd-0.egg-info /var/lib/microservices/venv/local/lib/python2.7/site-packages/rbd-0.egg-info \ - && ln -s /usr/lib/python2.7/dist-packages/rbd.x86_64-linux-gnu.so /var/lib/microservices/venv/local/lib/python2.7/site-packages/rbd.x86_64-linux-gnu.so - -# We have to set libvirt-python version to 2.4.0, to match the libvirt from testing repo. -RUN sed -i 's/libvirt-python.*/\#libvirt-python==3.0.0/' /var/lib/microservices/venv/constraints.txt && \ - pip install --upgrade https://libvirt.org/sources/python/libvirt-python-3.0.0.tar.gz && \ - /var/lib/microservices/venv/bin/pip install --upgrade rtslib-fb && \ - rm -f /etc/machine-id + && ln -s /usr/lib/python2.7/dist-packages/rbd.x86_64-linux-gnu.so /var/lib/microservices/venv/local/lib/python2.7/site-packages/rbd.x86_64-linux-gnu.so \ + && sed -i 's/libvirt-python.*/\#libvirt-python==3.0.0/' /var/lib/microservices/venv/constraints.txt \ + && pip install --upgrade https://libvirt.org/sources/python/libvirt-python-3.0.0.tar.gz \ + && /var/lib/microservices/venv/bin/pip install --upgrade rtslib-fb \ + && rm -f /etc/machine-id \ + && apt-get -y purge python-dev ENV PATH $PATH:/lib/udev