Integrate uwsgi with django

To enable parallel processing of plugin services

Change-Id: I61e9934273a8448ee6a437c9832a45d1f75a7a60
Issue-ID: MULTICLOUD-187
Signed-off-by: Yun Huang <yun.huang@windriver.com>

diff --git a/newton/requirements.txt b/newton/requirements.txt
index df84bef..5eb0f36 100644 (file)
--- a/newton/requirements.txt
+++ b/newton/requirements.txt
@@ -13,6 +13,9 @@ keystoneauth1==2.19.0
 #python-memcached
 python-memcached
 
+#uwsgi for parallel processing
+uwsgi
+
 # for unit test
 coverage==4.2
 mock==2.0.0

diff --git a/newton/run.sh b/newton/run.sh
index 43de581..a355cb8 100755 (executable)
--- a/newton/run.sh
+++ b/newton/run.sh
@@ -15,7 +15,8 @@
 
 memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
 export PYTHONPATH=lib/share
-nohup python manage.py runserver 0.0.0.0:9003 2>&1 &
+#nohup python manage.py runserver 0.0.0.0:9003 2>&1 &
+nohup uwsgi --http :9003 --module newton.wsgi --master --processes 4 &
 
 logDir="/var/log/onap/multicloud/openstack/newton"
 if [ ! -x  $logDir  ]; then

diff --git a/newton/stop.sh b/newton/stop.sh
index f743bf9..506d996 100755 (executable)
--- a/newton/stop.sh
+++ b/newton/stop.sh
@@ -13,5 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ps auxww | grep 'manage.py runserver 0.0.0.0:9003' | awk '{print $2}' | xargs kill -9
+#ps auxww | grep 'manage.py runserver 0.0.0.0:9003' | awk '{print $2}' | xargs kill -9
+ps auxww |grep 'uwsgi --http :9003 --module newton.wsgi --master' |awk '{print $2}' |xargs kill -9
 ps auxww | grep 'memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid' | awk '{print $2}' | xargs kill -9

diff --git a/ocata/requirements.txt b/ocata/requirements.txt
index 76a3c0b..34ceaec 100644 (file)
--- a/ocata/requirements.txt
+++ b/ocata/requirements.txt
@@ -11,6 +11,9 @@ keystoneauth1==2.18.0
 #python-memcached
 python-memcached
 
+#uwsgi for parallel processing
+uwsgi
+
 # for unit test
 coverage==4.2
 mock==2.0.0

diff --git a/ocata/run.sh b/ocata/run.sh
index f1bcfa9..c0293f6 100644 (file)
--- a/ocata/run.sh
+++ b/ocata/run.sh
@@ -15,7 +15,8 @@
 
 memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
 export PYTHONPATH=lib/share
-nohup python manage.py runserver 0.0.0.0:9006 2>&1 &
+#nohup python manage.py runserver 0.0.0.0:9006 2>&1 &
+nohup uwsgi --http :9006 --module ocata.wsgi --master --processes 4 &
 
 logDir="/var/log/onap/multicloud/openstack/ocata"
 if [ ! -x  $logDir  ]; then

diff --git a/ocata/stop.sh b/ocata/stop.sh
index 5a2209f..1402a97 100644 (file)
--- a/ocata/stop.sh
+++ b/ocata/stop.sh
@@ -13,5 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ps auxww | grep 'manage.py runserver 0.0.0.0:9006' | awk '{print $2}' | xargs kill -9
+#ps auxww | grep 'manage.py runserver 0.0.0.0:9006' | awk '{print $2}' | xargs kill -9
+ps auxww |grep 'uwsgi --http :9006 --module ocata.wsgi --master' |awk '{print $2}' |xargs kill -9
 ps auxww | grep 'memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid' | awk '{print $2}' | xargs kill -9

diff --git a/windriver/requirements.txt b/windriver/requirements.txt
index 25a691a..c3576f5 100644 (file)
--- a/windriver/requirements.txt
+++ b/windriver/requirements.txt
@@ -11,6 +11,9 @@ keystoneauth1==2.18.0
 #python-memcached
 python-memcached
 
+#uwsgi for parallel processing
+uwsgi
+
 # for unit test
 coverage==4.2
 mock==2.0.0

diff --git a/windriver/run.sh b/windriver/run.sh
index 05413d2..4cc23a6 100644 (file)
--- a/windriver/run.sh
+++ b/windriver/run.sh
@@ -15,7 +15,8 @@
 
 memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
 export PYTHONPATH=lib/share
-nohup python manage.py runserver 0.0.0.0:9005 2>&1 &
+#nohup python manage.py runserver 0.0.0.0:9005 2>&1 &
+nohup uwsgi --http :9005 --module titanium_cloud.wsgi --master --processes 4 &
 
 logDir="/var/log/onap/multicloud/openstack/windriver"
 if [ ! -x  $logDir  ]; then

diff --git a/windriver/stop.sh b/windriver/stop.sh
index a84fb3b..ab8a72d 100644 (file)
--- a/windriver/stop.sh
+++ b/windriver/stop.sh
@@ -13,5 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ps auxww | grep 'manage.py runserver 0.0.0.0:9005' | awk '{print $2}' | xargs kill -9
+#ps auxww | grep 'manage.py runserver 0.0.0.0:9005' | awk '{print $2}' | xargs kill -9
+ps auxww |grep 'uwsgi --http :9005 --module titanium_cloud.wsgi --master' |awk '{print $2}' |xargs kill -9
 ps auxww | grep 'memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid' | awk '{print $2}' | xargs kill -9