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>

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)