From f92c10a994a2818d8e03ac0be35c6d697530bcb3 Mon Sep 17 00:00:00 2001 From: JingLu5 Date: Wed, 21 Jun 2017 10:07:41 +0000 Subject: HA testcase improvement This patch improve HA test case in the following aspects: 1. the "GeneralHA" type now will check if the target service process in the controller node. 2. support ignore server certificate 3. add debug log for recovering service failed 4. improve method to kill keystone process Change-Id: I9ae7ab54391fe41d5d7f3e4951a7ac2e3ba75968 Signed-off-by: JingLu5 (cherry picked from commit 5b99f1532ec4d15258ec86e970acd2904954b3bc) --- .../scenarios/availability/ha_tools/nova/delete_flavor.bash | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash') diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash b/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash index e998464c7..617dcf8a3 100644 --- a/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash +++ b/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash @@ -14,4 +14,10 @@ set -e -openstack flavor delete $1 +if [ $OS_CACERT ] && [ "$(echo $OS_CACERT | tr '[:upper:]' '[:lower:]')" = "false" ]; then + SECURE="--insecure" +else + SECURE="" +fi + +openstack "${SECURE}" flavor delete $1 -- cgit 1.2.3-korg