This patch fixes bugs:
- '-l' option for scp is different from that of ssh, so remove
this option from the common param for scp and ssh.
- trap ERR was not executed, so replace it by trap EXIT
Change-Id: Id50ff29656fa100f420ae9ccc7a8a19a65a941c8
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
(cherry picked from commit
eed432fa413d3afeecdd65ef0f73559920012df9)
# get ssh key from installer node
sudo scp $ssh_opts root@"$INSTALLER_IP":/home/stack/.ssh/id_rsa instack_key
# 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
- ssh_opts_cpu="$ssh_opts -i instack_key -l heat-admin"
+ ssh_opts_cpu="$ssh_opts -i instack_key"
dev=$(/usr/sbin/ip route | awk '/^default/{print $5}')
sleep 1
echo sudo ip link set $dev down
dev=$(/usr/sbin/ip route | awk '/^default/{print $5}')
sleep 1
echo sudo ip link set $dev down
echo sudo ip link set $dev up
sleep 1
END_TXT
chmod +x disable_network.sh
echo 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() {
}
calculate_notification_time() {
stop_monitor
stop_inspector
stop_consumer
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
"[ -e disable_network.log ] && cat disable_network.log"
nova service-force-down --unset "$COMPUTE_HOST" nova-compute
echo "preparing VM image..."
download_image
echo "preparing VM image..."
download_image
calculate_notification_time
calculate_notification_time