X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=scripts%2Finstall-openmano.sh;h=3492bcd289c94dd198764d856ee0789cbc978fad;hb=d573573c267f0db9ee21c454ed2a5a086967c81e;hp=9eda047093eb1d99e7b9e9c22fc6f636789c4c87;hpb=05a8b7bc29197345f9718796c110d6cf3c2ad176;p=osm%2FRO.git

diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh
index 9eda0470..3492bcd2 100755
--- a/scripts/install-openmano.sh
+++ b/scripts/install-openmano.sh
@@ -127,7 +127,7 @@ fi
 #Discover Linux distribution
 #try redhat type
 [ -f /etc/redhat-release ] && _DISTRO=$(cat /etc/redhat-release 2>/dev/null | cut  -d" " -f1) 
-#if not assuming ubuntu type
+#else assuming ubuntu type
 [ -f /etc/redhat-release ] || _DISTRO=$(lsb_release -is  2>/dev/null)            
 if [ "$_DISTRO" == "Ubuntu" ]
 then
@@ -178,8 +178,7 @@ else
     OPENMANO_BASEFOLDER=$(dirname $HERE)
 fi
 
-
-if [[ -z "$NO_PACKAGES" ]]
+if [[ -z "$NO_PACKAGES" ]]  #if (UPDATE REPOS)
 then
 echo '
 #################################################################
@@ -193,9 +192,9 @@ echo '
   && sudo rpm -ivh epel-release-7-5.noarch.rpm && sudo yum install -y epel-release && rm -f epel-release-7-5.noarch.rpm
 [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && sudo yum repolist
 
-fi
+fi #if (UPDATE REPOS)
 
-if [[ -z "$NO_PACKAGES" ]]
+if [[ -z "$NO_PACKAGES" ]] #if (INSTALL DEPENDENCIES)
 then
 echo '
 #################################################################
@@ -203,10 +202,9 @@ echo '
 #################################################################'
 [ "$_DISTRO" == "Ubuntu" ] && install_packages "git make screen wget mysql-client"
 [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "git make screen wget mariadb-client"
+fi #if (INSTALL DEPENDENCIES)
 
-
-
-if [[ -z "$NO_PACKAGES" ]]
+if [[ -z "$NO_PACKAGES" ]] #if (PYTHON PACKAGES AND PIP PACKAGES)
 then
 echo '
 #################################################################
@@ -224,14 +222,14 @@ sudo pip install progressbar
 sudo pip install prettytable
 sudo pip install pyvmomi
 
-#requiered for AWS connector
+#required for AWS connector
 [ "$_DISTRO" == "Ubuntu" ] && install_packages "python-boto"
 [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "python-boto"  #TODO check if at Centos it exist with this name, or PIP should be used
 
 #install openstack client needed for using openstack as a VIM
 [ "$_DISTRO" == "Ubuntu" ] && install_packages "python-novaclient python-keystoneclient python-glanceclient python-neutronclient python-cinderclient"
 [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "python-devel" && easy_install python-novaclient python-keystoneclient python-glanceclient python-neutronclient python-cinderclient #TODO revise if gcc python-pip is needed
-fi  #[[ -z "$NO_PACKAGES" ]]
+fi #if (PYTHON PACKAGES AND PIP PACKAGES)
 
 if [[ -z $NOCLONE ]]; then
     echo '
@@ -250,11 +248,10 @@ echo '
 su $SUDO_USER -c "git -C ${OPENMANO_BASEFOLDER} clone ${GIT_OVIM_URL} openvim"
 [[ -z $DEVELOP ]] && su $SUDO_USER -c "git -C ${OPENMANO_BASEFOLDER}/openvim checkout master"
 # Install debian dependencies before setup.py
-#[ "$_DISTRO" == "Ubuntu" ] && install_packages "git"
-#[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "git"
+[ "$_DISTRO" == "Ubuntu" ] && install_packages "libmysqlclient-dev"
+[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "libmysqlclient-dev"  #TODO check if that's the name in CentOS and RedHat
 make -C ${OPENMANO_BASEFOLDER}/openvim lite
-
-
+OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'`
 
 if [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ]
 then
@@ -347,7 +344,7 @@ echo '
 #####        CREATE AND INIT MANO_VIM DATABASE              #####
 #################################################################'
 # Install mano_vim_db after setup
-    ${OPENMANO_BASEFOLDER}/openvim/database_utils/install-db-server.sh -U $DBUSER ${DBPASSWD_PARAM/p/P} -u mano -p manopw -d mano_vim_db || exit 1
+    ${OSMLIBOVIM_PATH}/database_utils/install-db-server.sh -U $DBUSER ${DBPASSWD_PARAM/p/P} -u mano -p manopw -d mano_vim_db || exit 1
 
 fi