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 /yardstick/benchmark/core | |
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 'yardstick/benchmark/core')
-rw-r--r-- | yardstick/benchmark/core/task.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/yardstick/benchmark/core/task.py b/yardstick/benchmark/core/task.py index 40122764c..3a151dbba 100644 --- a/yardstick/benchmark/core/task.py +++ b/yardstick/benchmark/core/task.py @@ -503,7 +503,7 @@ def check_environment(): auth_url = os.environ.get('OS_AUTH_URL', None) if not auth_url: try: - source_env(constants.OPENSTACK_RC_FILE) + source_env(constants.OPENRC) except IOError as e: if e.errno != errno.EEXIST: raise |