From: kasar <pkasar@vmware.com>
Date: Tue, 25 Sep 2018 06:51:30 +0000 (-0700)
Subject: Modified vROPs install.sh to support python3 modules in MON
X-Git-Tag: v5.0.0~39
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=500962a597724c8851a64a94d40f073ea463cd57;p=osm%2FMON.git

Modified vROPs install.sh to support python3 modules in MON

Change-Id: Ieabbf723025aff6460ca88c8e6ecdbf4eef30729
Signed-off-by: kasar <pkasar@vmware.com>
---

diff --git a/osm_mon/plugins/vRealiseOps/vROPs_Webservice/install.sh b/osm_mon/plugins/vRealiseOps/vROPs_Webservice/install.sh
index 2948ec3..6d05dfc 100755
--- a/osm_mon/plugins/vRealiseOps/vROPs_Webservice/install.sh
+++ b/osm_mon/plugins/vRealiseOps/vROPs_Webservice/install.sh
@@ -52,14 +52,14 @@ function install_packages(){
 
 apt-get update  # To get the latest package lists
 
-[ "$_DISTRO" == "Ubuntu" ] && install_packages "python-yaml python-bottle python-jsonschema python-requests libxml2-dev libxslt-dev python-dev python-pip openssl"
-[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "python-jsonschema python-requests libxslt-devel libxml2-devel python-devel python-pip openssl"
+[ "$_DISTRO" == "Ubuntu" ] && install_packages "python3-yaml python3-bottle python3-jsonschema python3-requests libxml2-dev libxslt-dev python3-dev python3-pip openssl"
+[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "python3-jsonschema python3-requests libxslt-devel libxml2-devel python3-devel python3-pip openssl"
 #The only way to install python-bottle on Centos7 is with easy_install or pip
 [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && easy_install -U bottle
 
 #required for vmware connector TODO move that to separete opt in install script
-pip install pip==9.0.3
-pip install cherrypy
+pip3 install pip==9.0.3
+pip3 install cherrypy
 
 echo '
  #################################################################
@@ -76,7 +76,7 @@ echo '
  #####             Start Web Service                      #####
  #################################################################'
 
-nohup python "${WebServiceFile}" &
+nohup python3 "${WebServiceFile}" &
 
 echo '
  #################################################################