diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-14 11:33:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-14 11:33:23 +0000 |
| commit | 4899c8c070d4f74a51a0349dbf64cd5f7dd696e3 (patch) | |
| tree | adb8659c7fdab9d9db535eb9e0a8e5477bde5e54 | |
| parent | ca10614f5f3b7e8cda43083a316904e7fdbb5c28 (diff) | |
| parent | e8800f9156ef888a13381b3a059e5056dcd976fa (diff) | |
| download | kolla-4899c8c070d4f74a51a0349dbf64cd5f7dd696e3.tar.gz kolla-4899c8c070d4f74a51a0349dbf64cd5f7dd696e3.zip | |
Merge "Fix missing libvirt python module in ceilometer-compute"
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 90933e06e..5e59e126d 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -9,7 +9,7 @@ RUN yum -y install \ 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 }} |