Skip to content

Commit 2ac10b2

Browse files
Catherine2019Catherine2019
authored
fix security group async issues (#473)
* restore timeout_virsh to virsh and adjust async secgroups Signed-off-by: Catherine <[email protected]> * add branch protection workflow Signed-off-by: Catherine <[email protected]> * fix reapply possible sg name Signed-off-by: Catherine <[email protected]> --------- Signed-off-by: Catherine <[email protected]>
1 parent ba60c70 commit 2ac10b2

26 files changed

+85
-84
lines changed

‎.github/workflows/ci.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: 'Check Branch'
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
check_branch:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Check branch
11+
if: github.base_ref == 'main' && github.head_ref != 'staging'
12+
run: |
13+
echo "ERROR: You can only merge to main from staging."
14+
exit 1

‎scripts/cloudrc

-5
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,6 @@ function get_uss_gateway()
149149
[ -n "$uss_id" ] && echo $uss_id
150150
}
151151

152-
function timeout_virsh()
153-
{
154-
timeout -s 9 5 virsh $*
155-
}
156-
157152
function async_exec()
158153
{
159154
exec 3<&0

‎scripts/kvm/action_vm.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@ function wait_vm_status()
2020
vm_ID=inst-$1
2121
action=$2
2222
if [ "$action" = "restart" ]; then
23-
timeout_virsh reboot $vm_ID
23+
virsh reboot $vm_ID
2424
wait_vm_status $vm_ID "running"
2525
elif [ "$action" = "start" ]; then
26-
timeout_virsh start $vm_ID
26+
virsh start $vm_ID
2727
wait_vm_status $vm_ID "running"
2828
elif [ "$action" = "stop" ]; then
29-
timeout_virsh shutdown $vm_ID
29+
virsh shutdown $vm_ID
3030
wait_vm_status $vm_ID "shut_off"
3131
elif [ "$action" = "hard_stop" ]; then
32-
timeout_virsh destroy $vm_ID
32+
virsh destroy $vm_ID
3333
wait_vm_status $vm_ID "shut_off"
3434
elif [ "$action" = "hard_restart" ]; then
35-
timeout_virsh destroy $vm_ID
35+
virsh destroy $vm_ID
3636
wait_vm_status $vm_ID "shut_off"
37-
timeout_virsh start $vm_ID
37+
virsh start $vm_ID
3838
elif [ "$action" = "pause" ]; then
39-
timeout_virsh suspend $vm_ID
39+
virsh suspend $vm_ID
4040
wait_vm_status $vm_ID "paused"
4141
elif [ "$action" = "resume" ]; then
42-
timeout_virsh resume $vm_ID
42+
virsh resume $vm_ID
4343
wait_vm_status $vm_ID "running"
4444
else
4545
die "Invalid action: $action"

‎scripts/kvm/apply_vm_nic.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ nic_name=tap$(echo $vm_mac | cut -d: -f4- | tr -d :)
1919
vm_br=br$vlan
2020
./create_link.sh $vlan
2121
brctl setageing $vm_br 0
22-
timeout_virsh domiflist $vm_ID | grep $vm_mac
22+
virsh domiflist $vm_ID | grep $vm_mac
2323
if [ $? -ne 0 ]; then
24-
timeout_virsh attach-interface $vm_ID bridge $vm_br --model virtio --mac $vm_mac --target $nic_name --live
25-
timeout_virsh attach-interface $vm_ID bridge $vm_br --model virtio --mac $vm_mac --target $nic_name --config
24+
virsh attach-interface $vm_ID bridge $vm_br --model virtio --mac $vm_mac --target $nic_name --live
25+
virsh attach-interface $vm_ID bridge $vm_br --model virtio --mac $vm_mac --target $nic_name --config
2626
fi
2727
udevadm settle
2828
./set_nic_speed.sh "$ID" "$nic_name" "$inbound" "$outbound"
29-
./reapply_secgroup.sh "$vm_ip" "$vm_mac" "$allow_spoofing" "$nic_name" "$ID"
29+
./reapply_secgroup.sh "$vm_ip" "$vm_mac" "$allow_spoofing" "$nic_name"
3030
./set_subnet_gw.sh "$router" "$vlan" "$gateway" "$ext_vlan"

‎scripts/kvm/async_job/clear_sg_chain.sh

+9-6
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,21 @@
33
cd `dirname $0`
44
source ../../cloudrc
55

6-
[ $# -lt 1 ] && echo "$0 <interface>" && exit -1
6+
[ $# -lt 1 ] && echo "$0 <interface> [force]" && exit -1
77

88
vnic=$1
9+
force=$2
910
chain_in=secgroup-in-$vnic
1011
chain_out=secgroup-out-$vnic
1112
chain_as=secgroup-as-$vnic
1213

13-
for i in {1..35}; do
14-
[ -f $async_job_dir/$vnic ] && break
15-
sleep 1
16-
done
17-
rm -f $async_job_dir/$vnic
14+
if [ "$force" != "true" ]; then
15+
for i in {1..35}; do
16+
[ -f $async_job_dir/$vnic ] && break
17+
sleep 1
18+
done
19+
rm -f $async_job_dir/$vnic
20+
fi
1821

1922
apply_fw -D FORWARD -m physdev --physdev-out $vnic --physdev-is-bridged -j secgroup-chain
2023
apply_fw -D FORWARD -m physdev --physdev-in $vnic --physdev-is-bridged -j secgroup-chain

‎scripts/kvm/async_job/reapply_secgroup.sh

+2-12
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,15 @@
33
cd `dirname $0`
44
source ../../cloudrc
55

6-
[ $# -lt 3 ] && echo "$0 <vm_ip> <vm_mac> <allow_spoofing> [nic_name] [vm_ID]" && exit -1
6+
[ $# -lt 3 ] && echo "$0 <vm_ip> <vm_mac> <allow_spoofing> [nic_name]" && exit -1
77

88
vm_ip=${1%%/*}
99
vm_mac=$2
1010
allow_spoofing=$3
1111
nic_name=$4
12-
vm_ID=$5
1312

14-
if [ -n "$vm_ID" ]; then
15-
for i in {1..30}; do
16-
virsh qemu-agent-command "inst-$vm_ID" '{"execute":"guest-ping"}'
17-
if [ $? -eq 0 ]; then
18-
break
19-
fi
20-
sleep 1
21-
done
22-
fi
2313
[ -z "$nic_name" ] && nic_name=tap$(echo $vm_mac | cut -d: -f4- | tr -d :)
24-
../clear_sg_chain.sh "$nic_name"
14+
./clear_sg_chain.sh "$nic_name" "true"
2515
../create_sg_chain.sh "$nic_name" "$vm_ip" "$vm_mac" "$allow_spoofing"
2616
../apply_sg_rule.sh "$nic_name"
2717
touch $async_job_dir/$nic_name

‎scripts/kvm/attach_vm_nic.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ nic_name=tap$(echo $vm_mac | cut -d: -f4- | tr -d :)
1616
vm_br=br$vlan
1717
./create_link.sh $vlan
1818
brctl setageing $vm_br 0
19-
timeout_virsh domiflist $vm_ID | grep $vm_mac
19+
virsh domiflist $vm_ID | grep $vm_mac
2020
if [ $? -ne 0 ]; then
21-
timeout_virsh attach-interface $vm_ID bridge $vm_br --model virtio --mac $vm_mac --target $nic_name --live
22-
timeout_virsh attach-interface $vm_ID bridge $vm_br --model virtio --mac $vm_mac --target $nic_name --config
21+
virsh attach-interface $vm_ID bridge $vm_br --model virtio --mac $vm_mac --target $nic_name --live
22+
virsh attach-interface $vm_ID bridge $vm_br --model virtio --mac $vm_mac --target $nic_name --config
2323
fi
2424
./set_nic_speed "$ID" "$nic_name" "$inbound" "$outbound"
2525
./create_sg_chain.sh $nic_name $vm_ip $vm_mac

‎scripts/kvm/attach_vol.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ vol_name=$2
1010
device=$3
1111
vol_file=$volume_dir/$vol_name.disk
1212
vm_xml=$xml_dir/$vm_ID.xml
13-
timeout_virsh attach-disk $vm_ID $vol_file $device
13+
virsh attach-disk $vm_ID $vol_file $device
1414
if [ $? -eq 0 ]; then
1515
echo "|:-COMMAND-:| /opt/cloudland/scripts/frontback/`basename $0` $vm_ID $vol_name $device"
1616
else
1717
echo "|:-COMMAND-:| /opt/cloudland/scripts/frontback/`basename $0` '' '$vol_name' ''"
1818
fi
19-
timeout_virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml
19+
virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml

‎scripts/kvm/attach_volume_local.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ count=$(virsh dumpxml $vm_ID | grep -c "<disk type='network' device='disk'>")
1515
let letter=98+$count
1616
device=vd$(printf "\\$(printf '%03o' "$letter")")
1717
sed -i "s#VOLUME_SOURCE#$vol_path#g;s#VOLUME_TARGET#$device#g;" $vol_xml
18-
timeout_virsh attach-device $vm_ID $vol_xml --config --persistent
18+
virsh attach-device $vm_ID $vol_xml --config --persistent
1919
if [ $? -eq 0 ]; then
2020
echo "|:-COMMAND-:| $(basename $0) '$1' '$vol_ID' '$device'"
2121
else
2222
echo "|:-COMMAND-:| $(basename $0) '' '$vol_ID' ''"
2323
fi
2424
vm_xml=$xml_dir/$vm_ID/$vm_ID.xml
25-
timeout_virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml
25+
virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml

‎scripts/kvm/attach_volume_wds_vhost.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ vol_xml=$xml_dir/$vm_ID/disk-${vol_ID}.xml
2929
cp $template_dir/wds_volume.xml $vol_xml
3030
device=vd$(printf "\\$(printf '%03o' "$letter")")
3131
sed -i "s#VM_UNIX_SOCK#$ux_sock#g;s#VOLUME_TARGET#$device#g;" $vol_xml
32-
timeout_virsh attach-device $vm_ID $vol_xml --config --persistent
32+
virsh attach-device $vm_ID $vol_xml --config --persistent
3333
if [ $? -eq 0 ]; then
3434
echo "|:-COMMAND-:| $(basename $0) '$1' '$vol_ID' '$device'"
3535
else
@@ -38,4 +38,4 @@ else
3838
echo "|:-COMMAND-:| $(basename $0) '' '$vol_ID' ''"
3939
fi
4040
vm_xml=$xml_dir/$vm_ID/$vm_ID.xml
41-
timeout_virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml
41+
virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml

‎scripts/kvm/build_meta.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ if [ -n "${login_port}" ] && [ "${login_port}" != "22" ] && [ ${login_port} -gt
106106
' - sed -i \"s/^#Port .*/Port '${login_port}'/\" /etc/ssh/sshd_config\n'\
107107
' - sed -i \"s/^Port .*/Port '${login_port}'/\" /etc/ssh/sshd_config\n'\
108108
' - systemctl daemon-reload\n'\
109-
' - systemctl restart sshd\n'\
110109
' - systemctl restart ssh.socket\n'
110+
' - systemctl restart sshd || systemctl restart ssh\n'
111111
)
112112
fi
113113

‎scripts/kvm/capture_image.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ image_name=image-$img_ID-$prefix
1313
state=error
1414

1515
# its better to let user shutdown the vm before capturing the image
16-
# timeout_virsh suspend $vm_ID
16+
# virsh suspend $vm_ID
1717
if [ -z "$wds_address" ]; then
1818
# capture the image from the running instance locally
1919
image=${image_dir}/image-$vm_ID.qcow2
@@ -45,5 +45,5 @@ else
4545
volume_id=$(wds_curl GET "api/v2/sync/block/volumes?name=$image_name" | jq -r '.volumes[0].id')
4646
[ -n "$volume_id" ] && state=available
4747
fi
48-
# timeout_virsh resume $vm_ID
48+
# virsh resume $vm_ID
4949
echo "|:-COMMAND-:| capture_image.sh '$img_ID' '$state' 'qcow2' 'success'"

‎scripts/kvm/clear_vm.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ vm_ID=inst-$ID
1010
router=$2
1111
boot_volume=$3
1212
vm_xml=$(virsh dumpxml $vm_ID)
13-
timeout_virsh undefine $vm_ID
14-
cmd="timeout_virsh destroy $vm_ID"
13+
virsh undefine $vm_ID
14+
cmd="virsh destroy $vm_ID"
1515
result=$(eval "$cmd")
1616
count=$(echo $vm_xml | xmllint --xpath 'count(/domain/devices/interface)' -)
1717
for (( i=1; i <= $count; i++ )); do

‎scripts/kvm/create_snapshot.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ vm_ID=$1
99
snap_file=$snapshot_dir/$vm_ID.qcow2
1010
stat='failed'
1111

12-
timeout_virsh suspend $vm_ID
12+
virsh suspend $vm_ID
1313
image=${image_dir}/$vm_ID.qcow2
1414

1515
qemu-img convert -f qcow2 -O qcow2 $image $snap_file
1616
snap_size=`ls -l $snap_file | cut -d' ' -f5`
1717
[ $? -eq 0 ] && stat='created'
18-
timeout_virsh resume $vm_ID
18+
virsh resume $vm_ID
1919
echo "|:-COMMAND-:| /opt/cloudland/scripts/frontback/`basename $0` '$vm_ID' '$snap_size' '$stat'"

‎scripts/kvm/create_vm.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ source ../cloudrc
88
vm_ID=$1
99
vm_xml=$xml_dir/$vm_ID.xml
1010
[ -f $vm_xml ] || die "No such vm definition"
11-
timeout_virsh desc $vm_ID &> /dev/null
11+
virsh desc $vm_ID &> /dev/null
1212
if [ $? != 0 ]; then
13-
timeout_virsh create $vm_xml
14-
timeout_virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml
13+
virsh create $vm_xml
14+
virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml
1515
[ $? -eq 0 ] || die "failed to create vm"
1616
fi
1717
vm_stat=running

‎scripts/kvm/detach_nic.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ vm_br=br$vlan
1414
./clear_link.sh $vlan
1515
state=$(virsh dominfo $vm_ID | grep State | cut -d: -f2- | xargs)
1616
if [ "$state" = "running" ]; then
17-
timeout_virsh detach-interface $vm_ID bridge --mac $vm_mac --live --config
17+
virsh detach-interface $vm_ID bridge --mac $vm_mac --live --config
1818
else
19-
timeout_virsh detach-interface $vm_ID bridge --mac $vm_mac --config
19+
virsh detach-interface $vm_ID bridge --mac $vm_mac --config
2020
fi
2121
./clear_sg_chain.sh $nic_name

‎scripts/kvm/detach_vol.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ vol_name=$2
1010
device=$3
1111
vol_file=$volume_dir/$vol_name.disk
1212

13-
timeout_virsh detach-disk $vm_ID $device
13+
virsh detach-disk $vm_ID $device
1414
[ $? -eq 0 ] && echo "|:-COMMAND-:| /opt/cloudland/scripts/frontback/`basename $0` '$vm_ID' '$vol_name' '$device'"

‎scripts/kvm/detach_volume_local.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ vm_ID=inst-$1
99
vol_ID=$2
1010
vol_UUID=$3
1111
vol_xml=$xml_dir/$vm_ID/disk-${vol_ID}.xml
12-
timeout_virsh detach-device $vm_ID $vol_xml --config --persistent
12+
virsh detach-device $vm_ID $vol_xml --config --persistent
1313
if [ $? -eq 0 ]; then
1414
echo "|:-COMMAND-:| $(basename $0) '$1' '$vol_ID'"
1515
else
1616
echo "|:-COMMAND-:| $(basename $0) '' '$vol_ID'"
1717
fi
1818
vm_xml=$xml_dir/$vm_ID/$vm_ID.xml
19-
timeout_virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml
19+
virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml

‎scripts/kvm/detach_volume_wds_vhost.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ vm_ID=inst-$1
1010
vol_ID=$2
1111
vol_xml=$xml_dir/$vm_ID/disk-${vol_ID}.xml
1212

13-
timeout_virsh detach-device $vm_ID $vol_xml --config --persistent
13+
virsh detach-device $vm_ID $vol_xml --config --persistent
1414
if [ $? -eq 0 ]; then
1515
echo "|:-COMMAND-:| $(basename $0) '$1' '$vol_ID'"
1616
else
1717
echo "|:-COMMAND-:| $(basename $0) '' '$vol_ID'"
1818
fi
1919
vm_xml=$xml_dir/$vm_ID/$vm_ID.xml
20-
timeout_virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml
20+
virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml
2121

2222
get_wds_token
2323
vhost_name=instance-$ID-vol-$vol_ID

‎scripts/kvm/launch_vm.sh

+4-5
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,10 @@ vm_QA="$qemu_agent_dir/$vm_ID.agent"
9797
vm_xml=$xml_dir/$vm_ID/${vm_ID}.xml
9898
cp $template $vm_xml
9999
sed -i "s/VM_ID/$vm_ID/g; s/VM_MEM/$vm_mem/g; s/VM_CPU/$vm_cpu/g; s#VM_IMG#$vm_img#g; s#VM_UNIX_SOCK#$ux_sock#g; s#VM_META#$vm_meta#g; s#VM_AGENT#$vm_QA#g" $vm_xml
100-
timeout_virsh define $vm_xml
101-
timeout_virsh autostart $vm_ID
102-
timeout_virsh start $vm_ID --paused
103-
jq .vlans <<< $metadata | async_exec ./sync_nic_info.sh "$ID" "$vm_name"
104-
timeout_virsh resume $vm_ID
100+
virsh define $vm_xml
101+
virsh autostart $vm_ID
102+
jq .vlans <<< $metadata | ./sync_nic_info.sh "$ID" "$vm_name"
103+
virsh start $vm_ID
105104
[ $? -eq 0 ] && state=running
106105
echo "|:-COMMAND-:| $(basename $0) '$ID' '$state' '$SCI_CLIENT_ID' 'init'"
107106

‎scripts/kvm/migrate_vm.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ ephemeral=$image_dir/${vm_ID}.ephemeral
1616
[ -f "$ephemeral" ] && copy_target $ephemeral $hyper
1717
metaiso=$cache_dir/meta/${vm_ID}.iso
1818
[ -f "$metaiso" ] && copy_target $metaiso $hyper
19-
action_target $hyper "sudo virsh define $xml_dir/${vm_ID}.xml && sudo timeout_virsh start $vm_ID"
19+
action_target $hyper "sudo virsh define $xml_dir/${vm_ID}.xml && sudo virsh start $vm_ID"
2020
state=$(action_target $hyper "sudo virsh dominfo $vm_ID" | grep State | cut -d: -f2- | xargs)
2121
if [ "$state" = "running" ]; then
2222
mv $xml_dir $backup_dir
2323
mv $inst_disk $ephemeral $metaiso $backup_dir/$vm_ID
2424
./clear_vm.sh $ID
2525
else
26-
timeout_virsh undefine $vm_ID
26+
virsh undefine $vm_ID
2727
fi

‎scripts/kvm/resize_vm.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ ephemeral_size=$6
1515

1616
./action_vm.sh $ID shutdown
1717
let vm_mem=${vm_mem%[m|M]}*1024
18-
timeout_virsh setmaxmem $vm_ID $vm_mem --config
19-
timeout_virsh setmem $vm_ID $vm_mem --config
20-
timeout_virsh setvcpus $vm_ID --count $vm_cpu --config
21-
timeout_virsh setvcpus $vm_ID --count $vm_cpu --config --maximum
22-
timeout_virsh setvcpus $vm_ID --count $vm_cpu --config
18+
virsh setmaxmem $vm_ID $vm_mem --config
19+
virsh setmem $vm_ID $vm_mem --config
20+
virsh setvcpus $vm_ID --count $vm_cpu --config
21+
virsh setvcpus $vm_ID --count $vm_cpu --config --maximum
22+
virsh setvcpus $vm_ID --count $vm_cpu --config
2323
vm_img=$image_dir/$vm_ID.disk
2424
vsize=$(qemu-img info $vm_img | grep 'virtual size:' | cut -d' ' -f4 | tr -d '(')
2525
let fsize=$disk_size*1024*1024*1024
@@ -28,13 +28,13 @@ if [ $ephemeral_size -gt 0 ]; then
2828
ephemeral=$image_dir/${vm_ID}.ephemeral
2929
if [ ! -f "$ephemeral" ]; then
3030
qemu-img create $ephemeral ${ephemeral_size}G
31-
timeout_virsh attach-disk $vm_ID $ephemeral vdb --config
31+
virsh attach-disk $vm_ID $ephemeral vdb --config
3232
else
3333
vsize=$(qemu-img info $ephemeral | grep 'virtual size:' | cut -d' ' -f4 | tr -d '(')
3434
let fsize=$ephemeral_size*1024*1024*1024
3535
[ $fsize -gt $vsize ] && qemu-img resize -q $ephemeral "${ephemeral_size}G" &> /dev/null
3636
fi
3737
fi
38-
timeout_virsh start $vm_ID
39-
[ $? -eq 0 ] && timeout_virsh dumpxml $vm_ID > $xml_dir/$vm_ID/${vm_ID}.xml
38+
virsh start $vm_ID
39+
[ $? -eq 0 ] && virsh dumpxml $vm_ID > $xml_dir/$vm_ID/${vm_ID}.xml
4040
echo "|:-COMMAND-:| inst_status.sh '$SCI_CLIENT_ID' '$ID running'"

‎scripts/kvm/resume.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ vm_ID=$1
1010
working_dir=/tmp/$vm_ID
1111
mkisofs -quiet -R -V config-2 -o ${cache_dir}/meta/${vm_ID}.iso $working_dir &> /dev/null
1212
#rm -rf $working_dir
13-
timeout_virsh start $vm_ID
13+
virsh start $vm_ID
1414
if [ $? -eq 0 ]; then
15-
timeout_virsh autostart $vm_ID
16-
timeout_virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml
15+
virsh autostart $vm_ID
16+
virsh dumpxml --security-info $vm_ID 2>/dev/null | sed "s/autoport='yes'/autoport='no'/g" > $vm_xml.dump && mv -f $vm_xml.dump $vm_xml
1717
vnc_port=$(xmllint --xpath 'string(/domain/devices/graphics/@port)' $vm_xml)
1818
vm_vnc="$vnc_port:$vnc_pass"
1919
fi

‎scripts/kvm/set_nic_speed.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ inbound_burst=$inbound_rate
1717
outbound_rate=$(( $outbound * 125 )) # in kilobytes per second
1818
outbound_peak=$(( $outbound_rate * 2 ))
1919
outbound_burst=$outbound_rate
20-
timeout_virsh domiftune $vm_ID $nic_name --inbound $inbound_rate,$inbound_peak,$inbound_burst --outbound $outbound_rate,$outbound_peak,$outbound_burst --config --live
20+
virsh domiftune $vm_ID $nic_name --inbound $inbound_rate,$inbound_peak,$inbound_burst --outbound $outbound_rate,$outbound_peak,$outbound_burst --config --live

‎scripts/kvm/set_user_passwd.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ source ../cloudrc
88
vm_ID=inst-$1
99
username=$2
1010
passwd=$3
11-
timeout_virsh set-user-password --domain $vm_ID --user $username --password $passwd
11+
virsh set-user-password --domain $vm_ID --user $username --password $passwd
1212
[ $? -ne 0 ] && die "Failed to set user password"
1313
echo "|:-COMMAND-:| $(basename $0) '$1' 'success'"

0 commit comments

Comments
 (0)