summaryrefslogtreecommitdiffstats
path: root/api/api-prepare.sh
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2017-04-01 01:19:16 +0000
committerJing Lu <lvjing5@huawei.com>2017-04-06 06:13:16 +0000
commit221f4482bab3361cdb69161147e4d32d098d9a43 (patch)
tree9c2e6608f2acfef314c18ecea695153fc127019d /api/api-prepare.sh
parentd19113a5cd65f83d29ea48a3ae75cefa1d914676 (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/api-prepare.sh')
-rwxr-xr-xapi/api-prepare.sh30
1 files changed, 28 insertions, 2 deletions
diff --git a/api/api-prepare.sh b/api/api-prepare.sh
index 5cc65c959..f2be48909 100755
--- a/api/api-prepare.sh
+++ b/api/api-prepare.sh
@@ -8,6 +8,33 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+: ${YARDSTICK_REPO_DIR:='/home/opnfv/repos/yardstick'}
+
+# generate uwsgi config file
+mkdir -p /etc/yardstick
+uwsgi_config='/etc/yardstick/yardstick.ini'
+if [[ ! -e "${uwsgi_config}" ]];then
+
+ cat << EOF > "${uwsgi_config}"
+[uwsgi]
+master = true
+debug = true
+chdir = ${YARDSTICK_REPO_DIR}/api
+module = server
+plugins = python
+processes = 10
+threads = 5
+async = true
+max-requests = 5000
+chmod-socket = 666
+callable = app_wrapper
+enable-threads = true
+close-on-exec = 1
+daemonize= /var/log/yardstick/uwsgi.log
+socket = /var/run/yardstick.sock
+EOF
+fi
+
# nginx config
nginx_config='/etc/nginx/conf.d/yardstick.conf'
@@ -24,7 +51,6 @@ server {
}
}
EOF
-echo "daemon off;" >> /etc/nginx/nginx.conf
fi
# nginx service start when boot
@@ -42,7 +68,7 @@ autorestart = true
[program:yardstick_uwsgi]
user = root
-directory = /home/opnfv/repos/yardstick/api
+directory = /etc/yardstick
command = uwsgi -i yardstick.ini
autorestart = true
EOF