From b74d875134b988a26441d559a9e700aaa68d6a0c Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Sat, 1 Apr 2017 01:19:16 +0000 Subject: 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 --- yardstick/benchmark/core/task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'yardstick/benchmark/core/task.py') 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 -- cgit 1.2.3-korg