summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRyota Mibu <r-mibu@cq.jp.nec.com>2016-07-27 13:16:51 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-27 13:16:52 +0000
commit1e490b1d4f9003471d64ea0b433a80122924cff3 (patch)
treece430fcc59febb603ffaccd08b5c4a2a81f2e75f /tests
parentcaa8d5ecd481fcd39aa97c7a8a61bbac41c0893d (diff)
parentd2113c14319740e2bc51441f1c0e73c457fc48c6 (diff)
Merge "Delete $VM_NAME and alrms with doctor user creds"
Diffstat (limited to 'tests')
-rwxr-xr-xtests/run.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/run.sh b/tests/run.sh
index 767a726a..ae030e22 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -266,11 +266,11 @@ cleanup() {
ssh $ssh_opts_cpu "$COMPUTE_USER@$COMPUTE_IP" \
"[ -e disable_network.log ] && cat disable_network.log"
- openstack $as_doctor_user server list | grep -q " $VM_NAME " && openstack server delete "$VM_NAME"
+ openstack $as_doctor_user server list | grep -q " $VM_NAME " && openstack $as_doctor_user server delete "$VM_NAME"
sleep 1
- alarm_id=$(ceilometer alarm-list | grep " $ALARM_NAME " | awk '{print $2}')
+ alarm_id=$(ceilometer $as_doctor_user alarm-list | grep " $ALARM_NAME " | awk '{print $2}')
sleep 1
- [ -n "$alarm_id" ] && ceilometer alarm-delete "$alarm_id"
+ [ -n "$alarm_id" ] && ceilometer $as_doctor_user alarm-delete "$alarm_id"
sleep 1
image_id=$(openstack image list | grep " $IMAGE_NAME " | awk '{print $2}')