cinder-volume: change lvm pv to be configured at runtime

By default lvm-iscsi uses loopdev as lvm physical volume.
This patch makes it a bit easier to allow other layer to
be able configure lvm physical volume.

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

2 files changed, 15 insertions, 9 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder-volume b/meta-openstack/recipes-devtools/python/python-cinder/cinder-volume
index 51bbac9..3cc2aa3 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder/cinder-volume
+++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder-volume
@@ -29,15 +29,8 @@ start()
         fi
     fi
 
-        #Load volume group
-        DEV=`losetup -j /etc/cinder/volumes-backing | cut -d ":" -f 1 | head -1`
-        if [ -z $DEV ]; then
-                DEV=`losetup -f --show /etc/cinder/volumes-backing`
-        fi
-        if ! vgs cinder-volumes &> /dev/null ; then
-            vgcreate cinder-volumes $DEV
-        fi
-        vgchange -ay cinder-volumes
+    #Load volume group
+    /bin/bash /etc/cinder/drivers/lvm_iscsi_setup.sh
 
     echo -n "Starting $DESC..."
 
diff --git a/meta-openstack/recipes-devtools/python/python-cinder/lvm_iscsi_setup.sh b/meta-openstack/recipes-devtools/python/python-cinder/lvm_iscsi_setup.sh
new file mode 100644
index 0000000..6cd7011
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-cinder/lvm_iscsi_setup.sh
@@ -0,0 +1,13 @@
+#Load volume group
+
+[[ -f /etc/cinder/volumes-backing ]] || truncate -s %CINDER_LVM_VOLUME_BACKING_FILE_SIZE% /etc/cinder/volumes-backing
+
+DEV=`losetup -j /etc/cinder/volumes-backing | cut -d ":" -f 1 | head -1`
+if [ -z $DEV ]; then
+    DEV=`losetup -f --show /etc/cinder/volumes-backing`
+fi
+if ! vgs cinder-volumes &> /dev/null ; then
+            vgcreate cinder-volumes $DEV
+fi
+
+vgchange -ay cinder-volumes