summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2017-04-10 11:01:57 +0000
committerJing Lu <lvjing5@huawei.com>2017-04-22 00:39:37 +0000
commit7d08b884344651d9ba3dd2830dcd976d2adba9f5 (patch)
tree5397b1050a84fc6e31775cc7b4a13bedd54295b7 /api
parent87d8de27074f71db307891e1230a9341f852d945 (diff)
Yardstick virtualenv support
JIRA: YARDSTICK-620 In the patch, I separate python-setuptools from install.sh and separate appdirs from requirements.txt because there will be error when install them in virtualenv. Also I will update the documentation when this patch merged; Change-Id: I99a532d1851983775869e7c5e8e65fd0229e86df Signed-off-by: chenjiankun <chenjiankun1@huawei.com> (cherry picked from commit bb365d411d88a71871993b4ed803c2ffbbcb79bf)
Diffstat (limited to 'api')
-rwxr-xr-xapi/api-prepare.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/api/api-prepare.sh b/api/api-prepare.sh
index f2be48909..7632d9da9 100755
--- a/api/api-prepare.sh
+++ b/api/api-prepare.sh
@@ -33,6 +33,9 @@ close-on-exec = 1
daemonize= /var/log/yardstick/uwsgi.log
socket = /var/run/yardstick.sock
EOF
+ if [[ "${YARDSTICK_VENV}" ]];then
+ echo "virtualenv = ${YARDSTICK_VENV}" >> "${uwsgi_config}"
+ fi
fi
# nginx config