diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh index 8f5b2b43a7..c36eae6621 100644 --- a/src/mad/sh/scripts_common.sh +++ b/src/mad/sh/scripts_common.sh @@ -1,4 +1,4 @@ -e -------------------------------------------------------------------------- # +# -------------------------------------------------------------------------- # # Copyright 2002-2020, OpenNebula Project, OpenNebula Systems # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # diff --git a/src/vmm_mad/remotes/kvm/detach_disk b/src/vmm_mad/remotes/kvm/detach_disk index 2b54271fa5..8bb172ccba 100755 --- a/src/vmm_mad/remotes/kvm/detach_disk +++ b/src/vmm_mad/remotes/kvm/detach_disk @@ -23,12 +23,10 @@ DOMAIN="$1" SOURCE="$2" TARGET="$3" TARGET_INDEX="$4" -VMID="$5" DETACH_PARAMS="--domain $DOMAIN --target $TARGET" -\ - exec_and_log "virsh --connect $LIBVIRT_URI detach-disk $DETACH_PARAMS" \ +exec_and_log "virsh --connect $LIBVIRT_URI detach-disk $DETACH_PARAMS" \ "Could not detach $TARGET from $DOMAIN" virsh --connect $LIBVIRT_URI dumpxml $DOMAIN | \ diff --git a/src/vmm_mad/remotes/kvm/reset b/src/vmm_mad/remotes/kvm/reset index 2505e313b1..6a4b8ccf6d 100755 --- a/src/vmm_mad/remotes/kvm/reset +++ b/src/vmm_mad/remotes/kvm/reset @@ -20,7 +20,6 @@ source $(dirname $0)/../../etc/vmm/kvm/kvmrc source $(dirname $0)/../../scripts_common.sh deploy_id=$1 -VMID=$3 exec_and_log "virsh --connect $LIBVIRT_URI reset $deploy_id" \ "Could not reset domain $deploy_id" diff --git a/src/vmm_mad/remotes/kvm/resize_disk b/src/vmm_mad/remotes/kvm/resize_disk index 34f2558849..2eefe60662 100755 --- a/src/vmm_mad/remotes/kvm/resize_disk +++ b/src/vmm_mad/remotes/kvm/resize_disk @@ -20,7 +20,6 @@ DOMAIN=$1 DISK_ID=$2 DISK_SIZE=$3 DRV_ACTION=$4 -VMID=$6 source $(dirname $0)/../../etc/vmm/kvm/kvmrc source $(dirname $0)/../../scripts_common.sh diff --git a/src/vmm_mad/remotes/kvm/shutdown b/src/vmm_mad/remotes/kvm/shutdown index 4d2b09223d..1d6c6d8c20 100755 --- a/src/vmm_mad/remotes/kvm/shutdown +++ b/src/vmm_mad/remotes/kvm/shutdown @@ -22,7 +22,6 @@ source $(dirname $0)/../../scripts_common.sh count=0 deploy_id=$1 -VMID=$3 shutdown_command="virsh --connect $LIBVIRT_URI shutdown $deploy_id" diff --git a/src/vmm_mad/remotes/kvm/snapshot_revert b/src/vmm_mad/remotes/kvm/snapshot_revert index 44d5a51183..cbca550bad 100755 --- a/src/vmm_mad/remotes/kvm/snapshot_revert +++ b/src/vmm_mad/remotes/kvm/snapshot_revert @@ -21,7 +21,6 @@ source $(dirname $0)/../../scripts_common.sh DOMAIN="$1" NAME="$2" -VMID="$3" retry_if "active block job" 3 5 exec_and_log \ "virsh --connect $LIBVIRT_URI snapshot-revert --force $DOMAIN $NAME" \