aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-01-08 01:05:55 -0500
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-01-15 00:33:53 -0500
commitb825fa0fac27ee733037ead3f52a2ca18a53a53c (patch)
tree78756bd4d4aa4187c1d8e78d35c6249ef4f6f8f4
parentb45880a1a11007476446c7e2f53b0fee43c43453 (diff)
downloadmeta-cloud-services-b825fa0fac27ee733037ead3f52a2ca18a53a53c.tar.gz
meta-cloud-services-b825fa0fac27ee733037ead3f52a2ca18a53a53c.tar.bz2
meta-cloud-services-b825fa0fac27ee733037ead3f52a2ca18a53a53c.zip
ceilometer: set libvirt_type to KVM, but allow modification for nested virt
We expose the libvirt_type config setting with a default value of 'kvm', but for nested virtualization configurations, we also provide a bbappend that will modify the value to 'qemu' automatically. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack-qemu/recipes-devtools/python/python-ceilometer_git.bbappend11
-rw-r--r--meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf2
2 files changed, 12 insertions, 1 deletions
diff --git a/meta-openstack-qemu/recipes-devtools/python/python-ceilometer_git.bbappend b/meta-openstack-qemu/recipes-devtools/python/python-ceilometer_git.bbappend
new file mode 100644
index 0000000..5d45d62
--- /dev/null
+++ b/meta-openstack-qemu/recipes-devtools/python/python-ceilometer_git.bbappend
@@ -0,0 +1,11 @@
+do_install_append() {
+ if [ ! -f "${WORKDIR}/ceilometer.conf" ]; then
+ return
+ fi
+
+ TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME}
+ CEILOMETER_CONF_DIR=${D}/${sysconfdir}/ceilometer
+
+ sed -e "s:^libvirt_type.*=.*$:libvirt_type = qemu:" \
+ -i ${CEILOMETER_CONF_DIR}/ceilometer.conf
+} \ No newline at end of file
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
index 892a6af..457199d 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
@@ -74,7 +74,7 @@
# Libvirt domain type (valid options are: kvm, lxc, qemu, uml,
# xen) (string value)
-#libvirt_type=kvm
+libvirt_type=kvm
# Override the default libvirt URI (which is dependent on
# libvirt_type) (string value)