diff options
| author |   chenjiankun <chenjiankun1@huawei.com> | 2017-04-01 01:19:16 +0000 |
|---|---|---|
| committer |   Jing Lu <lvjing5@huawei.com> | 2017-04-06 06:13:16 +0000 |
| commit | 221f4482bab3361cdb69161147e4d32d098d9a43 (patch) | |
| tree | 9c2e6608f2acfef314c18ecea695153fc127019d /api/utils/common.py | |
| parent | d19113a5cd65f83d29ea48a3ae75cefa1d914676 (diff) | |
Yardstick virtualenv support
JIRA: YARDSTICK-620
Currently we recommend using docker to run yardstick.
And it is hard to use virtualenv to install yardstick.
So I modify install.sh in yardstick root path.
It will support using virtualenv to install yardstick(including API) in
linux.
In this patch, I make yardstick support read yardstick configuration
have priority over constants.
Change-Id: I9ea1241b228532a6497451e6c8f232173ddb783e
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
(cherry picked from commit b74d875134b988a26441d559a9e700aaa68d6a0c)
Diffstat (limited to 'api/utils/common.py')
| -rw-r--r-- | api/utils/common.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/utils/common.py b/api/utils/common.py index 3e9bf8f8b..f8b0d40ba 100644 --- a/api/utils/common.py +++ b/api/utils/common.py @@ -11,10 +11,10 @@ import collections import logging from flask import jsonify +import six from api.utils.daemonthread import DaemonThread from yardstick.cmd.cli import YardstickCLI -import six logger = logging.getLogger(__name__) |