From 8cf0f56b8f1411e5fe56f9e6c5066c42a4753bd2 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Mon, 11 Nov 2013 17:43:57 +0100 Subject: [PATCH] feature #2446: rename shared_lvm to fs_lvm --- install.sh | 22 +++++++++---------- share/etc/oned.conf | 4 ++-- .../public/js/plugins/datastores-tab.js | 4 ++-- src/tm_mad/{shared_lvm => fs_lvm}/clone | 0 src/tm_mad/{shared_lvm => fs_lvm}/cpds | 0 src/tm_mad/{shared_lvm => fs_lvm}/delete | 0 src/tm_mad/{shared_lvm => fs_lvm}/ln | 0 src/tm_mad/{shared_lvm => fs_lvm}/mv | 0 src/tm_mad/{shared_lvm => fs_lvm}/mvds | 0 src/tm_mad/{shared_lvm => fs_lvm}/postmigrate | 0 src/tm_mad/{shared_lvm => fs_lvm}/premigrate | 0 11 files changed, 15 insertions(+), 15 deletions(-) rename src/tm_mad/{shared_lvm => fs_lvm}/clone (100%) rename src/tm_mad/{shared_lvm => fs_lvm}/cpds (100%) rename src/tm_mad/{shared_lvm => fs_lvm}/delete (100%) rename src/tm_mad/{shared_lvm => fs_lvm}/ln (100%) rename src/tm_mad/{shared_lvm => fs_lvm}/mv (100%) rename src/tm_mad/{shared_lvm => fs_lvm}/mvds (100%) rename src/tm_mad/{shared_lvm => fs_lvm}/postmigrate (100%) rename src/tm_mad/{shared_lvm => fs_lvm}/premigrate (100%) diff --git a/install.sh b/install.sh index bc5d6a6505..b07d10f9c1 100755 --- a/install.sh +++ b/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 \ diff --git a/share/etc/oned.conf b/share/etc/oned.conf index 905cc589f2..39d87509c0 100644 --- a/share/etc/oned.conf +++ b/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" diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index 55771177c6..39e4245e61 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -194,7 +194,7 @@ var create_datastore_tmpl = \ \ \ - \ + \ \ \ \ @@ -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'); diff --git a/src/tm_mad/shared_lvm/clone b/src/tm_mad/fs_lvm/clone similarity index 100% rename from src/tm_mad/shared_lvm/clone rename to src/tm_mad/fs_lvm/clone diff --git a/src/tm_mad/shared_lvm/cpds b/src/tm_mad/fs_lvm/cpds similarity index 100% rename from src/tm_mad/shared_lvm/cpds rename to src/tm_mad/fs_lvm/cpds diff --git a/src/tm_mad/shared_lvm/delete b/src/tm_mad/fs_lvm/delete similarity index 100% rename from src/tm_mad/shared_lvm/delete rename to src/tm_mad/fs_lvm/delete diff --git a/src/tm_mad/shared_lvm/ln b/src/tm_mad/fs_lvm/ln similarity index 100% rename from src/tm_mad/shared_lvm/ln rename to src/tm_mad/fs_lvm/ln diff --git a/src/tm_mad/shared_lvm/mv b/src/tm_mad/fs_lvm/mv similarity index 100% rename from src/tm_mad/shared_lvm/mv rename to src/tm_mad/fs_lvm/mv diff --git a/src/tm_mad/shared_lvm/mvds b/src/tm_mad/fs_lvm/mvds similarity index 100% rename from src/tm_mad/shared_lvm/mvds rename to src/tm_mad/fs_lvm/mvds diff --git a/src/tm_mad/shared_lvm/postmigrate b/src/tm_mad/fs_lvm/postmigrate similarity index 100% rename from src/tm_mad/shared_lvm/postmigrate rename to src/tm_mad/fs_lvm/postmigrate diff --git a/src/tm_mad/shared_lvm/premigrate b/src/tm_mad/fs_lvm/premigrate similarity index 100% rename from src/tm_mad/shared_lvm/premigrate rename to src/tm_mad/fs_lvm/premigrate