diff options
| author | Hui Kang <kangh@us.ibm.com> | 2016-04-01 16:46:16 -0400 |
|---|---|---|
| committer | Hui Kang <kangh@us.ibm.com> | 2016-04-10 00:28:52 -0400 |
| commit | e8800f9156ef888a13381b3a059e5056dcd976fa (patch) | |
| tree | c20c0cc62d503c9295e1d21eea1f712fc7f4c525 /docker/ceilometer/ceilometer-compute | |
| parent | bd5d38ef3c4514783231b15550ad4d02d066da35 (diff) | |
| download | kolla-e8800f9156ef888a13381b3a059e5056dcd976fa.tar.gz kolla-e8800f9156ef888a13381b3a059e5056dcd976fa.zip | |
Fix missing libvirt python module in ceilometer-compute
Change-Id: I108397dbc86e44a81f82d6e9fce9ae2ad9d0976b
Closes-Bug: #1565054
Diffstat (limited to 'docker/ceilometer/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 5837e9211..4db5e81b2 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 }} |