diff options
| author |   Ryota MIBU <r-mibu@cq.jp.nec.com> | 2016-02-20 13:08:30 +0900 |
|---|---|---|
| committer | Ryota Mibu <r-mibu@cq.jp.nec.com> | 2016-02-20 04:17:46 +0000 |
| commit | 914c18c6ffecc12026c8eb8838c719e6105bbcc1 (patch) | |
| tree | 5e9d7ae4f16d38e6b6d8ffa422ab6f8e64747e52 /tests/run.sh | |
| parent | 285c22406de5e74104cdd92468bcb6a0705f1eb4 (diff) | |
test: fix bugs (ssh args and force-down in cleanup)
This patch fixes two bugs:
- ssh target hostname is wrong (it trailing by ':')
- novaclient cannot execute 'force-down' since it tries
to use v2.0 endpoint which doesn't spport the new API,
Change-Id: I5ef3a8eda5fa7a6730b4eb456d0441d40718a010
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
(cherry picked from commit e891316ac35f062c66b15a7ee7981016c6edcc9e)
Diffstat (limited to 'tests/run.sh')
| -rwxr-xr-x | tests/run.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/run.sh b/tests/run.sh index 80d94b3f..9bd6573b 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -144,7 +144,7 @@ sleep 1 END_TXT chmod +x disable_network.sh 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 &' + ssh $ssh_opts_cpu "heat-admin@$COMPUTE_IP" 'nohup ./disable_network.sh > disable_network.log 2>&1 &' } calculate_notification_time() { @@ -164,7 +164,7 @@ cleanup() { 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 ./clean.py sleep 1 nova delete "$VM_NAME" sleep 1 |