diff options
author | Jing Lu <lvjing5@huawei.com> | 2017-06-23 01:52:13 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-06-23 01:52:13 +0000 |
commit | 6e3cb9346cb11acd6bf0882bd7f715b879246909 (patch) | |
tree | 653260ce1b5a7df90af132df790d6f89fb5f6ca4 /yardstick/benchmark/scenarios/availability/monitor | |
parent | b93bbc01bf90d4fe6defb137145e74aee8c3081e (diff) | |
parent | f92c10a994a2818d8e03ac0be35c6d697530bcb3 (diff) |
Merge "HA testcase improvement" into stable/danube
Diffstat (limited to 'yardstick/benchmark/scenarios/availability/monitor')
-rw-r--r-- | yardstick/benchmark/scenarios/availability/monitor/monitor_command.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/yardstick/benchmark/scenarios/availability/monitor/monitor_command.py b/yardstick/benchmark/scenarios/availability/monitor/monitor_command.py index 033a2d721..d757bd88d 100644 --- a/yardstick/benchmark/scenarios/availability/monitor/monitor_command.py +++ b/yardstick/benchmark/scenarios/availability/monitor/monitor_command.py @@ -7,6 +7,8 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## from __future__ import absolute_import + +import os import logging import subprocess import traceback @@ -53,6 +55,14 @@ class MonitorOpenstackCmd(basemonitor.BaseMonitor): self.cmd = self._config["command_name"] + try: + cacert = os.environ['OS_CACERT'] + except KeyError: + pass + else: + if cacert.lower() == "false": + self.cmd = self.cmd + " --insecure" + def monitor_func(self): exit_status = 0 exit_status, stdout = _execute_shell_command(self.cmd) |