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, 7 insertions, 0 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index 84ef48b..8aaf41a 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -21,6 +21,7 @@ my_ip = %CONTROLLER_IP%
 glance_host = %CONTROLLER_IP%
 lock_path=/var/lock/nova/
 state_path=/var/run/nova/
+libvirt_images_type = %LIBVIRT_IMAGES_TYPE%
 
 #VNC
 vnc_enabled = true
@@ -61,3 +62,9 @@ instance_usage_audit_period=hour
 notify_on_state_change=vm_and_task_state
 notification_driver=nova.openstack.common.notifier.rpc_notifier
 notification_driver=ceilometer.compute.nova_notifier
+
+# nova-compute configuration for ceph
+libvirt_images_rbd_pool=cinder-volumes
+libvirt_images_rbd_ceph_conf=/etc/ceph/ceph.conf
+rbd_user=cinder-volume
+#rbd_secret_uuid=