diff options
3 files changed, 20 insertions, 5 deletions
diff --git a/meta-openstack/README.setup b/meta-openstack/README.setup index 0657c9dd..6fc3b4a5 100644 --- a/meta-openstack/README.setup +++ b/meta-openstack/README.setup @@ -160,11 +160,12 @@ following steps will validate a simple compute node guest launch: * Cinder Multi-backend * -Cinder currently is configured to support multi-backend: lvm-iscsi, nfs, glusterfs backends. -When a Cinder volume is created, it's needed to be specified which backend its belong -to through "--volume_type" option passed in "cinder create" command. +Cinder currently is configured to support multi-backend: lvm-iscsi, nfs, +glusterfs, and ceph rbd. When a Cinder volume is created, it's needed to +be specified which backend it belongs to through "--volume_type" option passed +in "cinder create" command. -The Cinder volume types for lvm-iscsi and nfs can be created as following steps: +The Cinder volume types for these backends can be created following the steps: % . /etc/nova/openrc % cinder type-create lvm_iscsi @@ -173,6 +174,8 @@ The Cinder volume types for lvm-iscsi and nfs can be created as following steps: % cinder type-key nfs set volume_backend_name=Generic_NFS % cinder type-create glusterfs % cinder type-key glusterfs set volume_backend_name=GlusterFS + % cinder type-create cephrbd + % cinder type-key cephrbd set volume_backend_name=RBD_CEPH For example, to create 1G Cinder volume in lvm-iscsi backend: diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf index 6190ec58..10d7d9a0 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf +++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf @@ -1173,7 +1173,7 @@ rabbit_port=5672 # Define the names of the groups for multiple volume backends #enabled_backends=fakedriver,lvmdriver -enabled_backends=lvmdriver,nfsdriver,glusterfsdriver +enabled_backends=lvmdriver,nfsdriver,glusterfsdriver,rbdcephdriver # Define the groups as above #[fakedriver] @@ -1193,4 +1193,15 @@ volume_backend_name=Generic_NFS volume_group=glusterfs-group-1 volume_driver=cinder.volume.drivers.glusterfs.GlusterfsDriver volume_backend_name=GlusterFS + +[rbdcephdriver] +volume_driver=cinder.volume.drivers.rbd.RBDDriver +rbd_pool=cinder-volumes +rbd_ceph_conf=/etc/ceph/ceph.conf +rbd_flatten_volume_from_snapshot=false +rbd_max_clone_depth=5 +rbd_user=cinder-volume +#rbd_secret_uuid= +volume_backend_name=RBD_CEPH + # Total option count: 255 diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb index 40c1ece6..2b56292a 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb @@ -45,6 +45,7 @@ RDEPENDS_${PN} = " postgresql-setup \ qemu \ fuse \ ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse glusterfs-server', '', d)} \ + ${@base_contains('CINDER_EXTRA_FEATURES', 'ceph', 'task-ceph ceph-setup xfsprogs', '', d)} \ " RRECOMMENDS_${PN} = " \ |