openstack/kolla-ansible
Code Issues Proposed changes

Make Ceph install from Source on RPM

Browse Source 
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
This commit is contained in:
Steven Dake 2015-10-20 19:48:07 -04:00
parent a026ec253a
commit 194bb93ff2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/nova/nova-compute/Dockerfile.j2
View File

@ -15,7 +15,8 @@ RUN yum -y install \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ RUN pip uninstall -y requests \
&& yum -y install \
libvirt-python \ libvirt-python \
openvswitch \ openvswitch \
qemu-img \ qemu-img \