From e8800f9156ef888a13381b3a059e5056dcd976fa Mon Sep 17 00:00:00 2001 From: Hui Kang Date: Fri, 1 Apr 2016 16:46:16 -0400 Subject: [PATCH] Fix missing libvirt python module in ceilometer-compute Change-Id: I108397dbc86e44a81f82d6e9fce9ae2ad9d0976b Closes-Bug: #1565054 --- .../ceilometer-compute/Dockerfile.j2 | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 5837e92116..4db5e81b23 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -9,7 +9,7 @@ RUN yum install -y \ python-ceilometerclient \ && yum clean all - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ ceilometer-agent-compute \ @@ -17,6 +17,23 @@ RUN apt-get install -y --no-install-recommends \ && apt-get clean {% 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 %} {{ include_footer }}