diff options
author | Rex Lee <limingjiang@huawei.com> | 2017-10-13 06:57:28 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-10-13 06:57:28 +0000 |
commit | 3582056de8f3ed4b8f7ffaf710c3eebc4b0ac3f2 (patch) | |
tree | c8d345e0465138fbdedd843007057d34412b44a3 | |
parent | 4f8b511428cf31f8a74ffab9b9e662e7a05a8a76 (diff) | |
parent | bdff5cf70e2efef0f26798bebc77edfb0679c7ae (diff) |
Merge "task: use CONF_FILE from constants"
-rw-r--r-- | yardstick/benchmark/core/task.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/yardstick/benchmark/core/task.py b/yardstick/benchmark/core/task.py index 1512ca718..9b1b3f851 100644 --- a/yardstick/benchmark/core/task.py +++ b/yardstick/benchmark/core/task.py @@ -28,6 +28,7 @@ from jinja2 import Environment from yardstick.benchmark.contexts.base import Context from yardstick.benchmark.runners import base as base_runner +from yardstick.common.constants import CONF_FILE from yardstick.common.yaml_loader import yaml_load from yardstick.dispatcher.base import Base as DispatcherBase from yardstick.common.task_template import TaskTemplate @@ -36,7 +37,6 @@ from yardstick.common import constants from yardstick.common.html_template import report_template output_file_default = "/tmp/yardstick.out" -config_file = '/etc/yardstick/yardstick.conf' test_cases_dir_default = "tests/opnfv/test_cases/" LOG = logging.getLogger(__name__) @@ -68,7 +68,7 @@ class Task(object): # pragma: no cover self._set_log() try: - output_config = utils.parse_ini_file(config_file) + output_config = utils.parse_ini_file(CONF_FILE) except Exception: # all error will be ignore, the default value is {} output_config = {} |