Merge branch 'feature-2446' into one-4.4

install.sh

@@ -284,7 +284,7 @@ VAR_DIRS="$VAR_LOCATION/remotes \
           $VAR_LOCATION/remotes/tm/ \
           $VAR_LOCATION/remotes/tm/dummy \
           $VAR_LOCATION/remotes/tm/shared \
-          $VAR_LOCATION/remotes/tm/shared_lvm \
+          $VAR_LOCATION/remotes/tm/fs_lvm \
           $VAR_LOCATION/remotes/tm/qcow2 \
           $VAR_LOCATION/remotes/tm/ssh \
           $VAR_LOCATION/remotes/tm/vmfs \
@@ -470,7 +470,7 @@ INSTALL_FILES=(
     VMM_EXEC_EC2_SCRIPTS:$VAR_LOCATION/remotes/vmm/ec2
     TM_FILES:$VAR_LOCATION/remotes/tm
     TM_SHARED_FILES:$VAR_LOCATION/remotes/tm/shared
-    TM_SHARED_LVM_FILES:$VAR_LOCATION/remotes/tm/shared_lvm
+    TM_FS_LVM_FILES:$VAR_LOCATION/remotes/tm/fs_lvm
     TM_QCOW2_FILES:$VAR_LOCATION/remotes/tm/qcow2
     TM_SSH_FILES:$VAR_LOCATION/remotes/tm/ssh
     TM_VMFS_FILES:$VAR_LOCATION/remotes/tm/vmfs
@@ -979,7 +979,7 @@ NETWORK_VMWARE_FILES="src/vnm_mad/remotes/vmware/clean \
 #-------------------------------------------------------------------------------
 # Transfer Manager commands, to be installed under $LIB_LOCATION/tm_commands
 #   - SHARED TM, $VAR_LOCATION/tm/shared
-#   - SHARED_LVM TM, $VAR_LOCATION/tm/shared_lvm
+#   - FS_LVM TM, $VAR_LOCATION/tm/fs_lvm
 #   - QCOW2 TM, $VAR_LOCATION/tm/qcow2
 #   - SSH TM, $VAR_LOCATION/tm/ssh
 #   - DUMMY TM, $VAR_LOCATION/tm/dummy
@@ -1003,14 +1003,14 @@ TM_SHARED_FILES="src/tm_mad/shared/clone \
                  src/tm_mad/shared/mvds \
                  src/tm_mad/shared/cpds"
 
-TM_SHARED_LVM_FILES="src/tm_mad/shared_lvm/clone \
-                 src/tm_mad/shared_lvm/ln \
-                 src/tm_mad/shared_lvm/mv \
-                 src/tm_mad/shared_lvm/mvds \
-                 src/tm_mad/shared_lvm/cpds \
-                 src/tm_mad/shared_lvm/premigrate \
-                 src/tm_mad/shared_lvm/postmigrate \
-                 src/tm_mad/shared_lvm/delete"
+TM_FS_LVM_FILES="src/tm_mad/fs_lvm/clone \
+                 src/tm_mad/fs_lvm/ln \
+                 src/tm_mad/fs_lvm/mv \
+                 src/tm_mad/fs_lvm/mvds \
+                 src/tm_mad/fs_lvm/cpds \
+                 src/tm_mad/fs_lvm/premigrate \
+                 src/tm_mad/fs_lvm/postmigrate \
+                 src/tm_mad/fs_lvm/delete"
 
 TM_QCOW2_FILES="src/tm_mad/qcow2/clone \
                  src/tm_mad/qcow2/delete \

share/etc/oned.conf

@@ -390,7 +390,7 @@ VM_MAD = [
 
 TM_MAD = [
     executable = "one_tm",
-    arguments = "-t 15 -d dummy,lvm,shared,shared_lvm,qcow2,ssh,vmfs,iscsi,ceph"
+    arguments = "-t 15 -d dummy,lvm,shared,fs_lvm,qcow2,ssh,vmfs,iscsi,ceph"
 ]
 
 TM_MAD_CONF = [
@@ -415,7 +415,7 @@ TM_MAD_CONF = [
 ]
 
 TM_MAD_CONF = [
-    name        = "shared_lvm",
+    name        = "fs_lvm",
     ln_target   = "SYSTEM",
     clone_target= "SYSTEM",
     shared      = "yes"

src/sunstone/public/js/plugins/datastores-tab.js

@@ -194,7 +194,7 @@ var create_datastore_tmpl =
                   <option value="iscsi">' + tr("iSCSI") + '</option>\
                   <option value="dummy">' + tr("Dummy") + '</option>\
                   <option value="lvm">' + tr("LVM") + '</option>\
-                  <option value="shared_lvm">' + tr("Shared LVM") + '</option>\
+                  <option value="fs_lvm">' + tr("FS LVM") + '</option>\
                   <option value="vmfs">' + tr("VMFS") + '</option>\
                   <option value="ceph">' + tr("Ceph") + '</option>\
                   <option value="custom">' + tr("Custom") + '</option>\
@@ -1144,7 +1144,7 @@ function select_block_lvm(){
 function select_fs_lvm(){
     $('select#ds_mad').val('fs');
     $('select#ds_mad').attr('disabled', 'disabled');
-    $('select#tm_mad').val('shared_lvm');
+    $('select#tm_mad').val('fs_lvm');
     $('select#tm_mad').attr('disabled', 'disabled');
     $('input#image_ds_type').attr('checked', 'true');
     $('input[name=ds_type]').attr('disabled', 'disabled');