Browse code

Merge "Add ability to specify cinder lvm_type option"

Jenkins authored on 2015/06/21 02:17:52
Showing 2 changed files
... ...
@@ -66,6 +66,10 @@ CINDER_SERVICE_PORT=${CINDER_SERVICE_PORT:-8776}
66 66
 CINDER_SERVICE_PORT_INT=${CINDER_SERVICE_PORT_INT:-18776}
67 67
 CINDER_SERVICE_PROTOCOL=${CINDER_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
68 68
 
69
+# What type of LVM device should Cinder use for LVM backend
70
+# Defaults to default, which is thick, the other valid choice
71
+# is thin, which as the name implies utilizes lvm thin provisioning.
72
+CINDER_LVM_TYPE=${CINDER_LVM_TYPE:-default}
69 73
 
70 74
 # Default backends
71 75
 # The backend format is type:name where type is one of the supported backend
... ...
@@ -51,6 +51,7 @@ function configure_cinder_backend_lvm {
51 51
     iniset $CINDER_CONF $be_name volume_driver "cinder.volume.drivers.lvm.LVMVolumeDriver"
52 52
     iniset $CINDER_CONF $be_name volume_group $VOLUME_GROUP_NAME-$be_name
53 53
     iniset $CINDER_CONF $be_name iscsi_helper "$CINDER_ISCSI_HELPER"
54
+    iniset $CINDER_CONF $be_name lvm_type "$CINDER_LVM_TYPE"
54 55
 
55 56
     if [[ "$CINDER_SECURE_DELETE" == "False" ]]; then
56 57
         iniset $CINDER_CONF $be_name volume_clear none