Modify the way of startup for GVNFM driver

Change-Id: I228b0c73a649c23abd5c1ba361cebded4304bd54
Issue-ID: VFC-1771
Signed-off-by: dengyh <dengyuanhong@chinamobile.com>

diff --git a/gvnfmadapter/run.sh b/gvnfmadapter/run.sh
index 9063114..4f7a55f 100755 (executable)
--- a/gvnfmadapter/run.sh
+++ b/gvnfmadapter/run.sh
@@ -18,10 +18,10 @@ if [ ! -x  $logDir  ]; then
        mkdir -p $logDir
 fi
 
-# nohup python manage.py runserver 0.0.0.0:8484 > /dev/null &
+nohup python manage.py runserver 0.0.0.0:8484 > /dev/null &
 
-if [ "${SSL_ENABLED}" = "true" ]; then
-   nohup uwsgi --https :8484,driver/pub/ssl/cert/foobar.crt,driver/pub/ssl/cert/foobar.key, -t 120 --module driver.wsgi --master --processes 4 &
-else
-   nohup uwsgi --http :8484 -t 120 --module driver.wsgi --master --processes 4 &
-fi
+#if [ "${SSL_ENABLED}" = "true" ]; then
+#   nohup uwsgi --https :8484,driver/pub/ssl/cert/foobar.crt,driver/pub/ssl/cert/foobar.key, -t 120 --module driver.wsgi --master --processes 4 &
+#else
+#   nohup uwsgi --http :8484 -t 120 --module driver.wsgi --master --processes 4 &
+#fi

diff --git a/gvnfmadapter/stop.sh b/gvnfmadapter/stop.sh
index 1e86dde..d1b8613 100755 (executable)
--- a/gvnfmadapter/stop.sh
+++ b/gvnfmadapter/stop.sh
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# ps auxww | grep 'manage.py runserver 0.0.0.0:8484' | awk '{print $1}' | xargs kill -9
+ps auxww | grep 'manage.py runserver 0.0.0.0:8484' | awk '{print $1}' | xargs kill -9
 # ps auxww |grep 'uwsgi --http' |awk '{print $1}' |xargs kill -9
 
-if [ "${SSL_ENABLED}" = "true" ]; then
-    ps auxww |grep 'uwsgi --https :8484' |awk '{print $1}' |xargs kill -9
-else
-    ps auxww |grep 'uwsgi --http :8484' |awk '{print $1}' |xargs kill -9
-fi
\ No newline at end of file
+#if [ "${SSL_ENABLED}" = "true" ]; then
+#    ps auxww |grep 'uwsgi --https :8484' |awk '{print $1}' |xargs kill -9
+#else
+#    ps auxww |grep 'uwsgi --http :8484' |awk '{print $1}' |xargs kill -9
+#fi
\ No newline at end of file