openstack/devstack
Code Issues Proposed changes

Install python-libvirt for ceilometer only if n-cpu enabled

Browse Source 
Nova is responsible for installing the libvirt package (if it is being
used). It is required by python-libvirt but python-libvirt only required
in ceilometer if nova compute is being used. There are some usage
scenarios where nova compute is not being used so in that case don't
install python-libvirt.

Change-Id: I0db66f1c0526e24ade98de85989a5ed8d37f0c4f
This commit is contained in:
Chris Dent 2015-06-17 16:42:43 +00:00
parent 40fc66324c
commit ccd4c2e177
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ceilometer
View File

@ -334,6 +334,8 @@ function install_ceilometer {
pip_install_gr pymongo pip_install_gr pymongo
fi fi
# Only install virt drivers if we're running nova compute
if is_service_enabled n-cpu ; then
if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
pip_install_gr libvirt-python pip_install_gr libvirt-python
fi fi
@ -341,6 +343,7 @@ function install_ceilometer {
if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then
pip_instal_gr oslo.vmware pip_instal_gr oslo.vmware
fi fi
fi
if [ "$CEILOMETER_BACKEND" = 'es' ] ; then if [ "$CEILOMETER_BACKEND" = 'es' ] ; then
${TOP_DIR}/pkg/elasticsearch.sh download ${TOP_DIR}/pkg/elasticsearch.sh download