From cbd10ee5a286c4f9eab71e412888d3ef9f4df4e4 Mon Sep 17 00:00:00 2001 From: meimei Date: Wed, 27 Jul 2016 17:09:04 +0800 Subject: [bugfix] issures in multisite testcase Change-Id: I351311688742c04c2c2b7278015e221178267fda Signed-off-by: meimei --- testcases/OpenStack/tempest/run_tempest.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'testcases/OpenStack') diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index b5393804..5d1648dc 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -233,9 +233,6 @@ def configure_tempest_feature(deployment_dir, mode): installer_password = ft_utils.get_parameter_from_yaml( "multisite." + installer_type + "_environment.installer_password") - multisite_controller_ip = ft_utils.get_parameter_from_yaml( - "multisite." + installer_type + - "_environment.multisite_controller_ip") ssh_options = "-o UserKnownHostsFile=/dev/null -o \ StrictHostKeyChecking=no" @@ -248,7 +245,7 @@ def configure_tempest_feature(deployment_dir, mode): installer_username, installer_ip) multisite_controller_ip = \ - "".join(os.popen(cmd).reawd().split()) + "".join(os.popen(cmd).read().split()) # Login to controller and get bind host details cmd = 'sshpass -p %s ssh 2>/dev/null %s %s@%s "ssh %s \\" \ @@ -308,7 +305,7 @@ def generate_test_list(deployment_dir, mode): if mode == 'smoke': testr_mode = "smoke" elif mode == 'feature_multisite': - testr_mode = " | grep kingbird " + testr_mode = " | grep -i kingbird " elif mode == 'full': testr_mode = "" else: -- cgit 1.2.3-korg