cinder: enable nfs backend

This patch enables multi-backend support (lvm-iscsi and nfs) on
cinder-volume.  This including changing cinder.conf, creating
missing nfs_shares config file, and adding mount.nfs into compute
node image.

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

2 files changed, 17 insertions, 4 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
index d922e03..aa0eba5 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
+++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
@@ -1173,14 +1173,20 @@ rabbit_port=5672
 
 # Define the names of the groups for multiple volume backends
 #enabled_backends=fakedriver,lvmdriver
+enabled_backends=lvmdriver,nfsdriver
 
 # Define the groups as above
-#[lvmdriver]
-#volume_group=lvm-group-1
-#volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
-#volume_backend_name=LVM_iSCSI_unique1
 #[fakedriver]
 #volume_driver=cinder.volume.driver.FakeISCSIDriver
 
+[lvmdriver]
+volume_group=cinder-volumes
+volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
+volume_backend_name=LVM_iSCSI
+
+[nfsdriver]
+volume_group=nfs-group-1
+volume_driver=cinder.volume.drivers.nfs.NfsDriver
+volume_backend_name=Generic_NFS
 
 # Total option count: 255
diff --git a/meta-openstack/recipes-devtools/python/python-cinder/nfs_setup.sh b/meta-openstack/recipes-devtools/python/python-cinder/nfs_setup.sh
new file mode 100644
index 0000000..1d7c475
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-cinder/nfs_setup.sh
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+# Default setup
+if [ "$1" == "1" ]; then
+    mkdir /etc/cinder/nfs_volumes
+    echo "/etc/cinder/nfs_volumes *(rw,nohide,insecure,no_subtree_check,async,no_root_squash)" >> /etc/exports
+fi