diff options
| author |   Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-01-27 05:13:46 +0000 |
|---|---|---|
| committer | Ryota MIBU <r-mibu@cq.jp.nec.com> | 2017-02-02 10:23:07 +0000 |
| commit | 89cd27c623e929e837a02eef0622c4ef33772ade (patch) | |
| tree | b7248e6877f23fc7e7ec21b001e2ea48d62544d8 /tests/run.sh | |
| parent | c9d0d2c9fc16f2e989444bc4d7d8fab8060433ba (diff) | |
Fix functions for fuel installer
JIRA: DOCTOR-58
Change-Id: Ic9326791007a3afa754cc64423b46adc17c59dc0
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
Diffstat (limited to 'tests/run.sh')
| -rwxr-xr-x | tests/run.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/run.sh b/tests/run.sh index e7afb518..227c6ea1 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -179,8 +179,7 @@ start_consumer() { nova list | grep ' overcloud-controller-[0-9] ' \ | sed -e 's/^.*ctlplane=//' -e 's/ *|\$//'") elif is_installer fuel; then - CONTROLLER_IPS=$(sshpass -p r00tme ssh 2>/dev/null $ssh_opts root@${INSTALLER_IP} \ - "fuel node | grep controller | cut -d '|' -f 5|xargs") + get_controller_ips fi die_if_not_set $LINENO CONTROLLER_IPS "Could not get CONTROLLER_IPS." @@ -236,6 +235,7 @@ inject_failure() { cat > disable_network.sh << 'END_TXT' #!/bin/bash -x dev=$(sudo ip a | awk '/ @COMPUTE_IP@\//{print $7}') +[[ -n "$dev" ]] || dev=$(sudo ip a | awk '/ @COMPUTE_IP@\//{print $5}') sleep 1 sudo ip link set $dev down echo "doctor set host down at" $(date "+%s.%N") @@ -309,6 +309,8 @@ unset_forced_down_hosts() { for host in $(openstack compute service list --service nova-compute \ -f value -c Host -c State | sed -n -e '/down$/s/ *down$//p') do + # TODO (r-mibu): make sample inspector use keystone v3 api + OS_AUTH_URL=${OS_AUTH_URL/v3/v2.0} \ python ./nova_force_down.py $host --unset done |