diff options
| author | Steven Dake <stdake@cisco.com> | 2015-10-20 19:48:07 -0400 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-10-20 19:55:22 -0400 |
| commit | 194bb93ff26cfda92ff79742d361350a353ecacd (patch) | |
| tree | 6ffee7d847c4daf91b2818d6f7c20198d9722b60 /docker/nova | |
| parent | a026ec253a616aa147cff72f43a38eda90789b0a (diff) | |
| download | kolla-194bb93ff26cfda92ff79742d361350a353ecacd.tar.gz kolla-194bb93ff26cfda92ff79742d361350a353ecacd.zip | |
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
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 2723ba711..2e91f17d8 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 \ |