summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-10-11 22:46:57 -0700
committerRoss Brattain <ross.b.brattain@intel.com>2017-10-13 13:59:38 -0700
commitfbd7a64782e557477aa01859b7876e0e53de2a6f (patch)
tree75f05d64e336e2728341d0544d1e57ca9ec6a01e
parent42a1cbaf5636387c65849ef04c8dd83bfa916206 (diff)
task: use CONF_FILE from constants
I'm not sure why we hardcoded config_file when the CONF_FILE constant will work. Change-Id: I45a1dc17ac2b185c659725f55462214acb74838d Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
-rw-r--r--yardstick/benchmark/core/task.py4
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 = {}