From 194bb93ff26cfda92ff79742d361350a353ecacd Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Tue, 20 Oct 2015 19:48:07 -0400
Subject: [PATCH] Make Ceph install from Source on RPM

Ceph doesnt install from source on RPM because Ceph pulls in
python-requests.  This causes a cpio error during unpacking
because requests is installed in the base image.  A simple
workaround is to remove in the nova-compute container which
is the only container this conflict occurs within.

backport: liberty

Change-Id: I493900854a53c98f1a5cb6478675a18feceefea5
Closes-Bug: #1508236
---
 docker/nova/nova-compute/Dockerfile.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 2723ba7117..2e91f17d8e 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -15,7 +15,8 @@ RUN yum -y install \
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
-RUN yum -y install \
+RUN pip uninstall -y requests \
+    && yum -y install \
         libvirt-python \
         openvswitch \
         qemu-img \