openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix missing libvirt python module in ceilometer-compute"

Browse Source
This commit is contained in:
Jenkins 2016-04-14 11:33:23 +00:00 committed by Gerrit Code Review
commit 4899c8c070
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docker/ceilometer/ceilometer-compute/Dockerfile.j2
View File

@ -9,7 +9,7 @@ RUN yum -y install \
python-ceilometerclient \ python-ceilometerclient \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
ceilometer-agent-compute \ ceilometer-agent-compute \
@ -17,6 +17,23 @@ RUN apt-get install -y --no-install-recommends \
&& apt-get clean && apt-get clean
{% endif %} {% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum install -y \
libvirt-devel \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \
libvirt-dev \
&& apt-get clean
{% endif %}
RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt libvirt-python
{% endif %} {% endif %}
{{ include_footer }} {{ include_footer }}