cinder: enable glusterfs backend

This patch adds glusterfs backend into multi-backend cinder
support (total of lvm-iscsi, nfs, and glusterfs).  This including
changing cinder.conf, creating missing glusterfs_shares config file,
and adding glusterfs-client into compute/controller node and
gluster-server into controller node.

Also meta-filesystems is included to pickup fuse filesytem which
is needed by glusterfs.

Signed-off-by: Vu Tran <vu.tran@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

6 files changed, 46 insertions, 3 deletions

diff --git a/meta-openstack/README.setup b/meta-openstack/README.setup
index 8ad892e..0657c9d 100644
--- a/meta-openstack/README.setup
+++ b/meta-openstack/README.setup
@@ -78,6 +78,7 @@ to the bblayers.conf file:
     /meta-cloud-services/meta-openstack \
     /meta-openembedded/meta-oe \
     /meta-openembedded/meta-networking \   
+    /meta-openembedded/meta-filesystems
 
 Package configurations
 ----------------------
@@ -109,7 +110,12 @@ On compute node, by default openstack-image-compute doesn't include
 initiator iscsi package.  If open-iscsi-user recipe exists in layers,
 the following can be added to local.conf:
 
-  CINDER_EXTRA_FEATURES += "open-iscsi-user"
+  CINDER_EXTRA_FEATURES += " open-iscsi-user"
+
+If glusterfs recipi exists in layers, the following can be added to
+local.conf:
+
+  CINDER_EXTRA_FEATURES += " glusterfs"
 
 Running an image
 ----------------
@@ -154,7 +160,7 @@ following steps will validate a simple compute node guest launch:
 
 * Cinder Multi-backend *
 
-Cinder currently is configured to support multi-backend: lvm-iscsi and nfs backends.
+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.
 
@@ -165,6 +171,8 @@ The Cinder volume types for lvm-iscsi and nfs can be created as following steps:
  % cinder type-key lvm_iscsi set volume_backend_name=LVM_iSCSI
  % cinder type-create nfs
  % cinder type-key nfs set volume_backend_name=Generic_NFS
+ % cinder type-create glusterfs
+ % cinder type-key glusterfs set volume_backend_name=GlusterFS
 
 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 aa0eba5..6190ec5 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
+enabled_backends=lvmdriver,nfsdriver,glusterfsdriver
 
 # Define the groups as above
 #[fakedriver]
@@ -1189,4 +1189,8 @@ volume_group=nfs-group-1
 volume_driver=cinder.volume.drivers.nfs.NfsDriver
 volume_backend_name=Generic_NFS
 
+[glusterfsdriver]
+volume_group=glusterfs-group-1
+volume_driver=cinder.volume.drivers.glusterfs.GlusterfsDriver
+volume_backend_name=GlusterFS
 # Total option count: 255
diff --git a/meta-openstack/recipes-devtools/python/python-cinder/glusterfs_setup.sh b/meta-openstack/recipes-devtools/python/python-cinder/glusterfs_setup.sh
new file mode 100644
index 0000000..30997d1
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-cinder/glusterfs_setup.sh
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+# Default setup
+if [ "$1" == "1" ]; then
+    mkdir /etc/cinder/glusterfs_volumes
+    /etc/init.d/glusterd start
+    gluster volume create glusterfs_volumes controller:/etc/cinder/glusterfs_volumes force
+    gluster volume start glusterfs_volumes force
+    /etc/init.d/glusterd stop
+fi
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index e9cc27d..6fb27f8 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -13,6 +13,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
     file://cinder-volume \
     file://0001-run_tests-respect-tools-dir.patch \
     file://nfs_setup.sh \
+    file://glusterfs_setup.sh \
         "
 
 SRCREV="8b5fb8409322f61d8b610c97c109a61bf48a940e"
@@ -41,6 +42,7 @@ do_install_append() {
 
     install -d ${CINDER_CONF_DIR}/drivers
     install -m 600 ${WORKDIR}/nfs_setup.sh ${CINDER_CONF_DIR}/drivers/
+    install -m 600 ${WORKDIR}/glusterfs_setup.sh ${CINDER_CONF_DIR}/drivers/
 
     install -d ${D}${localstatedir}/log/${SRCNAME}
 
@@ -61,6 +63,8 @@ do_install_append() {
 CINDER_LVM_VOLUME_BACKING_FILE_SIZE ?= "2G"
 CINDER_NFS_VOLUME_SERVERS_DEFAULT = "controller:/etc/cinder/nfs_volumes"
 CINDER_NFS_VOLUME_SERVERS ?= "${CINDER_NFS_VOLUME_SERVERS_DEFAULT}"
+CINDER_GLUSTERFS_VOLUME_SERVERS_DEFAULT = "controller:/glusterfs_volumes"
+CINDER_GLUSTERFS_VOLUME_SERVERS ?= "${CINDER_GLUSTERFS_VOLUME_SERVERS_DEFAULT}"
 
 pkg_postinst_${SRCNAME}-setup () {
     if [ "x$D" != "x" ]; then
@@ -87,6 +91,14 @@ pkg_postinst_${SRCNAME}-setup () {
         [[ "x${CINDER_NFS_VOLUME_SERVERS}" == "x${CINDER_NFS_VOLUME_SERVERS_DEFAULT}" ]] && is_default="1" || is_default="0"
         /bin/bash /etc/cinder/drivers/nfs_setup.sh ${is_default}
     fi
+
+    # Create Cinder glusterfs_share config file with default glusterfs server
+    if [ ! -f /etc/cinder/glusterfs_shares ] && [ -f /usr/sbin/glusterfsd ]; then
+        echo "${CINDER_GLUSTERFS_VOLUME_SERVERS}" > /etc/cinder/glusterfs_shares
+        sed 's/\s\+/\n/g' -i /etc/cinder/glusterfs_shares
+        [[ "x${CINDER_GLUSTERFS_VOLUME_SERVERS}" == "x${CINDER_GLUSTERFS_VOLUME_SERVERS_DEFAULT}" ]] && is_default="1" || is_default="0"
+        /bin/bash /etc/cinder/drivers/glusterfs_setup.sh ${is_default}
+    fi
 }
 
 PACKAGES += "${SRCNAME}-tests ${SRCNAME} ${SRCNAME}-setup ${SRCNAME}-api ${SRCNAME}-volume ${SRCNAME}-scheduler"
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
index 3787c3b..e2d56ba 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb
@@ -22,6 +22,8 @@ RDEPENDS_${PN} = " \
     ${@base_contains('CINDER_EXTRA_FEATURES', 'open-iscsi-user', 'open-iscsi-user', '', d)} \
     ${@base_contains('CINDER_EXTRA_FEATURES', 'iscsi-initiator-utils', 'iscsi-initiator-utils', '', d)} \
     nfs-utils-client \
+    fuse \
+    ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse', '', d)} \
     "
 
 RRECOMMENDS_${PN} = " \
@@ -33,4 +35,5 @@ RRECOMMENDS_${PN} = " \
     kernel-module-iscsi-boot-sysfs \
     kernel-module-iscsi-tcp \
     kernel-module-libiscsi \
+    kernel-module-fuse \
     "
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
index 6b8ae28..40c1ece 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb
@@ -43,5 +43,11 @@ RDEPENDS_${PN} = " postgresql-setup \
     novnc \
     chkconfig \
     qemu \
+    fuse \
+    ${@base_contains('CINDER_EXTRA_FEATURES', 'glusterfs', 'glusterfs glusterfs-fuse glusterfs-server', '', d)} \
+    "
+
+RRECOMMENDS_${PN} = " \
+    kernel-module-fuse \
     cloud-init \
     "