diff options
| author |   zhang ab <zhanganbing@chinamobile.com> | 2018-03-23 07:22:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-23 07:22:07 +0000 |
| commit | 0e9683577c34acfdea8f067813048bf47665ec4a (patch) | |
| tree | 4b19c1a6c93061708219d8837df474768ab582fb | |
| parent | aa9396108d3360dad94456c8016ff62914037383 (diff) | |
| parent | d7297be670b59ed2787d20d219c13bac5c8d965e (diff) | |
Merge "Add pecan in bootstrap script"
| -rw-r--r-- | multivimbroker/requirements.txt | 9 | ||||
| -rwxr-xr-x | multivimbroker/run.sh | 14 |
2 files changed, 17 insertions, 6 deletions
diff --git a/multivimbroker/requirements.txt b/multivimbroker/requirements.txt index ef24d49..1d8330c 100644 --- a/multivimbroker/requirements.txt +++ b/multivimbroker/requirements.txt @@ -24,4 +24,11 @@ mock==2.0.0 unittest_xml_reporting==1.12.0 # for onap logging -onappylog>=1.0.6
\ No newline at end of file +onappylog>=1.0.6 + +# for pecan framework +pecan>=1.2.1 +oslo.concurrency>=3.21.0 +oslo.config>=4.11.0 +oslo.service>=1.25.0 +eventlet>=0.20.0 diff --git a/multivimbroker/run.sh b/multivimbroker/run.sh index 35f2b9e..e73496f 100755 --- a/multivimbroker/run.sh +++ b/multivimbroker/run.sh @@ -26,10 +26,14 @@ if [ ! -x $logDir ]; then mkdir -p $logDir fi -nohup python manage.py runserver 0.0.0.0:9001 2>&1 & +if [ "$WEB_FRAMEWORK" == "pecan" ] +then + python multivimbroker/scripts/api.py +else + nohup python manage.py runserver 0.0.0.0:9001 2>&1 & -while [ ! -f $logDir/multivimbroker.log ]; do - sleep 1 -done + while [ ! -f $logDir/multivimbroker.log ]; do + sleep 1 + done -tail -F $logDir/multivimbroker.log + tail -F $logDir/multivimbroker.log |