nova-compute: enable to use ceph

Enable nova-compute to:

* use cinder volume stored in a ceph pool as a block device
* store glance image into a ceph pool.

Also port 2 patches from https://github.com/openstack/nova
branch master into Havana branch.

Signed-off-by: Vu Tran <vu.tran@windriver.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 7f3d2e2..523102a 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -14,6 +14,8 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}"
 SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
            file://0001-nova-api-paste.ini-make-controller-IP-configurable.patch \
            file://nova-add-migrate.cfg-to-the-MANIFEST.patch \
+           file://Make-rbd.libvirt_info-parent-class-compatible.patch \
+           file://Fix-rbd-backend-not-working-for-none-admin-ceph-user.patch \
            "
 
 SRC_URI += "file://nova-all \
@@ -30,6 +32,8 @@ S = "${WORKDIR}/git"
 
 inherit update-rc.d setuptools identity hosts useradd default_configs
 
+LIBVIRT_IMAGES_TYPE ?= "default"
+
 do_install_append() {
     if [ ! -f "${WORKDIR}/nova.conf" ]; then
         return
@@ -82,6 +86,8 @@ do_install_append() {
     sed -e "s:%COMPUTE_IP%:${COMPUTE_IP}:g" -i ${WORKDIR}/nova.conf
     sed -e "s:%COMPUTE_HOST%:${COMPUTE_HOST}:g" -i ${WORKDIR}/nova.conf
 
+    sed -e "s:%LIBVIRT_IMAGES_TYPE%:${LIBVIRT_IMAGES_TYPE}:g" -i ${WORKDIR}/nova.conf
+
     sed -e "s:%OS_PASSWORD%:${ADMIN_PASSWORD}:g" -i ${WORKDIR}/openrc
     sed -e "s:%SERVICE_TOKEN%:${SERVICE_TOKEN}:g" -i ${WORKDIR}/openrc