From 8ec736d5a5e30087f3e2b9edfdcfb6eb298f0d66 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Thu, 11 Jun 2015 18:22:08 +0200 Subject: [PATCH] feature #3782: Update all cpds to include the SNAP_ID parameter --- src/tm_mad/ceph/cpds | 1 - src/tm_mad/fs_lvm/cpds | 8 +++++--- src/tm_mad/lvm/cpds | 8 +++++--- src/tm_mad/shared/cpds | 11 +++++------ src/tm_mad/ssh/cpds | 11 +++++------ src/tm_mad/vmfs/mvds | 11 +++++------ 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/tm_mad/ceph/cpds b/src/tm_mad/ceph/cpds index c194032aec..a811614c58 100755 --- a/src/tm_mad/ceph/cpds +++ b/src/tm_mad/ceph/cpds @@ -16,7 +16,6 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -# mvds host:remote_system_ds/disk.i fe:SOURCE # cpds host:remote_system_ds/disk.i fe:SOURCE snapid vmid dsid # - fe is the front-end hostname # - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk diff --git a/src/tm_mad/fs_lvm/cpds b/src/tm_mad/fs_lvm/cpds index f4df668072..6e88b772da 100755 --- a/src/tm_mad/fs_lvm/cpds +++ b/src/tm_mad/fs_lvm/cpds @@ -16,16 +16,18 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -# mvds host:remote_system_ds/disk.i fe:SOURCE +# cpds host:remote_system_ds/disk.i fe:SOURCE snapid vmid dsid # - fe is the front-end hostname # - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk # - host is the target host to deploy the VM # - remote_system_ds is the path for the system datastore in the host +# - snapid is the snapshot id. "-1" for none SRC=$1 DST=$2 -VM_ID=$3 -DS_ID=$4 +SNAP_ID=$3 +VM_ID=$4 +DS_ID=$5 if [ -z "${ONE_LOCATION}" ]; then TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh diff --git a/src/tm_mad/lvm/cpds b/src/tm_mad/lvm/cpds index 8532363507..c97379f250 100755 --- a/src/tm_mad/lvm/cpds +++ b/src/tm_mad/lvm/cpds @@ -16,16 +16,18 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -# mvds host:remote_system_ds/disk.i fe:SOURCE +# cpds host:remote_system_ds/disk.i fe:SOURCE snapid vmid dsid # - fe is the front-end hostname # - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk # - host is the target host to deploy the VM # - remote_system_ds is the path for the system datastore in the host +# - snapid is the snapshot id. "-1" for none SRC=$1 DST=$2 -VM_ID=$3 -DS_ID=$4 +SNAP_ID=$3 +VM_ID=$4 +DS_ID=$5 if [ -z "${ONE_LOCATION}" ]; then TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh diff --git a/src/tm_mad/shared/cpds b/src/tm_mad/shared/cpds index 1a898ad2ba..fae3b52e8b 100755 --- a/src/tm_mad/shared/cpds +++ b/src/tm_mad/shared/cpds @@ -16,19 +16,18 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -# mvds host:remote_system_ds/disk.i fe:SOURCE vmid dsid +# cpds host:remote_system_ds/disk.i fe:SOURCE snapid vmid dsid # - fe is the front-end hostname # - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk # - host is the target host to deploy the VM # - remote_system_ds is the path for the system datastore in the host -# - vmid is the id of the VM -# - dsid is the target datastore (0 is the system datastore) +# - snapid is the snapshot id. "-1" for none SRC=$1 DST=$2 - -VMID=$3 -DSID=$4 +SNAP_ID=$3 +VMID=$4 +DSID=$5 if [ -z "${ONE_LOCATION}" ]; then TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh diff --git a/src/tm_mad/ssh/cpds b/src/tm_mad/ssh/cpds index e42b11feb7..2a7d64f691 100755 --- a/src/tm_mad/ssh/cpds +++ b/src/tm_mad/ssh/cpds @@ -16,19 +16,18 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -# cpds host:remote_system_ds/disk.i fe:SOURCE vmid dsid +# cpds host:remote_system_ds/disk.i fe:SOURCE snapid vmid dsid # - fe is the front-end hostname # - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk # - host is the target host to deploy the VM # - remote_system_ds is the path for the system datastore in the host -# - vmid is the id of the VM -# - dsid is the target datastore (0 is the system datastore) +# - snapid is the snapshot id. "-1" for none SRC=$1 DST=$2 - -VMID=$3 -DSID=$4 +SNAP_ID=$3 +VMID=$4 +DSID=$5 if [ -z "${ONE_LOCATION}" ]; then TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh diff --git a/src/tm_mad/vmfs/mvds b/src/tm_mad/vmfs/mvds index 59815c0869..824c08ac62 100755 --- a/src/tm_mad/vmfs/mvds +++ b/src/tm_mad/vmfs/mvds @@ -16,19 +16,18 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -# mvds host:remote_system_ds/disk.i fe:SOURCE vmid dsid +# cpds host:remote_system_ds/disk.i fe:SOURCE snapid vmid dsid # - fe is the front-end hostname # - SOURCE is the path of the disk image in the form DS_BASE_PATH/disk # - host is the target host to deploy the VM # - remote_system_ds is the path for the system datastore in the host -# - vmid is the id of the VM -# - dsid is the target datastore (0 is the system datastore) +# - snapid is the snapshot id. "-1" for none SRC=$1 DST=$2 - -VMID=$3 -DSID=$4 +SNAP_ID=$3 +VMID=$4 +DSID=$5 if [ -z "${ONE_LOCATION}" ]; then TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh