# get ssh key from installer node
sudo scp $ssh_opts root@"$INSTALLER_IP":/home/stack/.ssh/id_rsa instack_key
- if [ ! -r instack_key ]; then
- sudo chown $(whoami):$(whoami) instack_key
- fi
+ sudo chown $(whoami):$(whoami) instack_key
chmod 400 instack_key
- ssh_opts_cpu="$ssh_opts -i instack_key -l heat-admin"
+ ssh_opts_cpu="$ssh_opts -i instack_key"
}
download_image() {
}
inject_failure() {
- echo "disabling network of comupte host [$COMPUTE_HOST] for 3 mins..."
+ echo "disabling network of compute host [$COMPUTE_HOST] for 3 mins..."
cat > disable_network.sh << 'END_TXT'
#!/bin/bash -x
-dev=$(/usr/sbin/ip route | awk '/^default/{print $5}')
+dev=$(sudo ip route | awk '/^default/{print $5}')
sleep 1
-echo sudo ip link set $dev down
-sleep 120
-echo sudo ip link set $dev up
+sudo ip link set $dev down
+sleep 180
+sudo ip link set $dev up
sleep 1
END_TXT
chmod +x disable_network.sh
- scp $ssh_opts_cpu disable_network.sh "$COMPUTE_IP:"
- ssh $ssh_opts_cpu "$COMPUTE_IP:" 'nohup ./disable_network.sh > disable_network.log 2>&1 &'
+ scp $ssh_opts_cpu disable_network.sh "heat-admin@$COMPUTE_IP:"
+ ssh $ssh_opts_cpu "heat-admin@$COMPUTE_IP" 'nohup ./disable_network.sh > disable_network.log 2>&1 &'
}
calculate_notification_time() {
- detect=$(grep "doctor monitor detected at" monitor.log | awk '{print $5}')
+ detected=$(grep "doctor monitor detected at" monitor.log | awk '{print $5}')
notified=$(grep "doctor consumer notified at" consumer.log | awk '{print $5}')
- duration=$(echo "$notified $detect" | awk '{print $1 - $2 }')
- echo "$notified $detect" | \
- awk '{d = $1 - $2; if (d < 1 ) print d " OK"; else print d " NG"}'
+ echo "$notified $detected" | \
+ awk '{d = $1 - $2; if (d < 1 && d > 0) print d " OK"; else print d " NG"}'
}
cleanup() {
stop_monitor
stop_inspector
stop_consumer
- ssh $ssh_opts_cpu $COMPUTE_IP \
+ ssh $ssh_opts_cpu "heat-admin@$COMPUTE_IP" \
"[ -e disable_network.log ] && cat disable_network.log"
- nova service-force-down --unset "$COMPUTE_HOST" nova-compute
+ python ./nova_force_down.py "$COMPUTE_HOST" --unset
sleep 1
nova delete "$VM_NAME"
sleep 1
prepare_compute_ssh
-trap cleanup ERR
+trap cleanup EXIT
echo "preparing VM image..."
download_image
calculate_notification_time
-cleanup
-
echo "done"