Merge branch 'packaging'
Change-Id: I58a236852dab90f025d8300bbbf508d368d799c0
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh
index e40b570..9eda047 100755
--- a/scripts/install-openmano.sh
+++ b/scripts/install-openmano.sh
@@ -39,6 +39,7 @@
echo -e " --force: makes idenpotent, delete previous installations folders if needed"
echo -e " --noclone: assumes that openmano was cloned previously and that this script is run from the local repo"
echo -e " --no-install-packages: use this option to skip updating and installing the requires packages. This avoid wasting time if you are sure requires packages are present e.g. because of a previous installation"
+ echo -e " --no-db: do not install mysql server"
}
function install_packages(){
@@ -59,16 +60,6 @@
done
}
-function db_exists() {
- RESULT=`mysqlshow --defaults-extra-file="$2" | grep -v Wildcard | grep -o $1`
- if [ "$RESULT" == "$1" ]; then
- echo " DB $1 exists"
- return 0
- fi
- echo " DB $1 does not exist"
- return 1
-}
-
GIT_URL=https://osm.etsi.org/gerrit/osm/RO.git
GIT_OVIM_URL=https://osm.etsi.org/gerrit/osm/openvim.git
DBUSER="root"
@@ -80,6 +71,7 @@
FORCE=""
NOCLONE=""
NO_PACKAGES=""
+NO_DB=""
while getopts ":u:p:hiq-:" o; do
case "${o}" in
u)
@@ -104,6 +96,7 @@
[ "${OPTARG}" == "noclone" ] && NOCLONE="y" && continue
[ "${OPTARG}" == "quiet" ] && export QUIET_MODE=yes && export DEBIAN_FRONTEND=noninteractive && continue
[ "${OPTARG}" == "no-install-packages" ] && export NO_PACKAGES=yes && continue
+ [ "${OPTARG}" == "no-db" ] && NO_DB="y" && continue
echo -e "Invalid option: '--$OPTARG'\nTry $0 --help for more information" >&2
exit 1
;;
@@ -208,51 +201,10 @@
#################################################################
##### INSTALL REQUIRED PACKAGES #####
#################################################################'
-[ "$_DISTRO" == "Ubuntu" ] && install_packages "git make screen wget mysql-server"
-[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "git make screen wget mariadb mariadb-server"
+[ "$_DISTRO" == "Ubuntu" ] && install_packages "git make screen wget mysql-client"
+[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "git make screen wget mariadb-client"
-if [[ "$_DISTRO" == "Ubuntu" ]]
-then
- #start services. By default CentOS does not start services
- service mysql start >> /dev/null
- # try to set admin password, ignore if fails
- [[ -n $DBPASSWD ]] && mysqladmin -u $DBUSER -s password $DBPASSWD
-fi
-if [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ]
-then
- #start services. By default CentOS does not start services
- service mariadb start
- service httpd start
- systemctl enable mariadb
- systemctl enable httpd
- read -e -p "Do you want to configure mariadb (recommended if not done before) (Y/n)" KK
- [ "$KK" != "n" -a "$KK" != "no" ] && mysql_secure_installation
-
- read -e -p "Do you want to set firewall to grant web access port 80,443 (Y/n)" KK
- [ "$KK" != "n" -a "$KK" != "no" ] &&
- firewall-cmd --permanent --zone=public --add-service=http &&
- firewall-cmd --permanent --zone=public --add-service=https &&
- firewall-cmd --reload
-fi
-fi #[[ -z "$NO_PACKAGES" ]]
-
-#check and ask for database user password. Must be done after database installation
-if [[ -n $QUIET_MODE ]]
-then
- echo -e "\nCheking database connection and ask for credentials"
- while ! mysqladmin -s -u$DBUSER $DBPASSWD_PARAM status >/dev/null
- do
- [ -n "$logintry" ] && echo -e "\nInvalid database credentials!!!. Try again (Ctrl+c to abort)"
- [ -z "$logintry" ] && echo -e "\nProvide database credentials"
- read -e -p "database user? ($DBUSER) " DBUSER_
- [ -n "$DBUSER_" ] && DBUSER=$DBUSER_
- read -e -s -p "database password? (Enter for not using password) " DBPASSWD_
- [ -n "$DBPASSWD_" ] && DBPASSWD="$DBPASSWD_" && DBPASSWD_PARAM="-p$DBPASSWD_"
- [ -z "$DBPASSWD_" ] && DBPASSWD="" && DBPASSWD_PARAM=""
- logintry="yes"
- done
-fi
if [[ -z "$NO_PACKAGES" ]]
then
@@ -302,52 +254,7 @@
#[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "git"
make -C ${OPENMANO_BASEFOLDER}/openvim lite
-echo '
-#################################################################
-##### CREATE DATABASE #####
-#################################################################'
-echo -e "\nCreating temporary file form MYSQL installation and initialization"
-TEMPFILE="$(mktemp -q --tmpdir "installopenmano.XXXXXX")"
-trap 'rm -f "$TEMPFILE"' EXIT
-chmod 0600 "$TEMPFILE"
-echo -e "[client]\n user='$DBUSER'\n password='$DBPASSWD'">"$TEMPFILE"
-if db_exists "mano_db" $TEMPFILE ; then
- if [[ -n $FORCEDB ]]; then
- echo " Deleting previous database mano_db"
- DBDELETEPARAM=""
- [[ -n $QUIET_MODE ]] && DBDELETEPARAM="-f"
- mysqladmin --defaults-extra-file=$TEMPFILE -s drop mano_db $DBDELETEPARAM || ! echo "Could not delete mano_db database" || exit 1
- #echo "REVOKE ALL PRIVILEGES ON mano_db.* FROM 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- #echo "DELETE USER 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- mysqladmin --defaults-extra-file=$TEMPFILE -s create mano_db || ! echo "Error creating mano_db database" || exit 1
- echo "DROP USER 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- echo "CREATE USER 'mano'@'localhost' identified by 'manopw';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- echo "GRANT ALL PRIVILEGES ON mano_db.* TO 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- echo " Database 'mano_db' created, user 'mano' password 'manopw'"
- else
- echo "Database exists. Use option '--forcedb' to force the deletion of the existing one" && exit 1
- fi
-else
- mysqladmin -u$DBUSER $DBPASSWD_PARAM -s create mano_db || ! echo "Error creating mano_db database" || exit 1
- echo "CREATE USER 'mano'@'localhost' identified by 'manopw';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- echo "GRANT ALL PRIVILEGES ON mano_db.* TO 'mano'@'localhost';" | mysql --defaults-extra-file=$TEMPFILE -s || ! echo "Failed while creating user mano at database" || exit 1
- echo " Database 'mano_db' created, user 'mano' password 'manopw'"
-fi
-
-
-echo '
-#################################################################
-##### INIT DATABASE #####
-#################################################################'
-su $SUDO_USER -c "${OPENMANO_BASEFOLDER}/database_utils/init_mano_db.sh -u mano -p manopw -d mano_db" || ! echo "Failed while initializing main database" || exit 1
-
-echo '
-#################################################################
-##### CREATE AND INIT MANO_VIM DATABASE #####
-#################################################################'
-# Install mano_vim_db after setup
-su $SUDO_USER -c "${OPENMANO_BASEFOLDER}/openvim/database_utils/install-db-server.sh -U $DBUSER ${DBPASSWD_PARAM/p/P} -u mano -p manopw -d mano_vim_db" || ! echo "Failed while installing ovim database" || exit 1
if [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ]
then
@@ -422,8 +329,27 @@
su $SUDO_USER -c 'echo ". ${HOME}/.bash_completion.d/python-argcomplete.sh" >> ~/.bashrc'
fi
+if [ -z "$NO_DB" ]; then
+echo '
+#################################################################
+##### INSTALL DATABASE SERVER #####
+#################################################################'
+ if [ -n "$QUIET_MODE" ]; then
+ DB_QUIET='-q'
+ fi
+ if [ -n "$FORCEDB" ]; then
+ DB_FORCE='--forcedb'
+ fi
+ ${OPENMANO_BASEFOLDER}/database_utils/install-db-server.sh -u $DBUSER $DBPASSWD_PARAM $DB_QUIET $DB_FORCE || exit 1
+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
+fi
if [[ -n "$INSTALL_AS_A_SERVICE" ]]
then
@@ -450,5 +376,3 @@
fi
-
-
diff --git a/scripts/openmano-report.sh b/scripts/openmano-report
similarity index 65%
rename from scripts/openmano-report.sh
rename to scripts/openmano-report
index 9402fac..13c941a 100755
--- a/scripts/openmano-report.sh
+++ b/scripts/openmano-report
@@ -25,8 +25,7 @@
DIRNAME=$(readlink -f ${BASH_SOURCE[0]})
DIRNAME=$(dirname $DIRNAME )
-OMCLIENT=$DIRNAME/../openmano/openmano
-OVCLIENT=$DIRNAME/../openvim/openvim
+OMCLIENT=openmano
#get screen log files at the beginning
echo
@@ -36,14 +35,8 @@
echo "-------------------------------"
echo "OPENMANO"
echo "-------------------------------"
-echo "cat $DIRNAME/../logs/openmano.log*"
-cat $DIRNAME/../logs/openmano.log*
-echo
-echo "-------------------------------"
-echo "OPENVIM"
-echo "-------------------------------"
-echo "cat $DIRNAME/../logs/openvim.?"
-cat $DIRNAME/../logs/openvim.?
+echo "cat /var/log/osm/openmano.log*"
+cat /var/log/osm/openmano.log*
echo
echo "-------------------------------"
echo
@@ -56,14 +49,8 @@
echo "-------------------------------"
echo "OPENMANO"
echo "-------------------------------"
-echo "cat $DIRNAME/../openmano/openmanod.py|grep ^__version__"
-cat $DIRNAME/../openmano/openmanod.py|grep ^__version__
-echo
-echo "-------------------------------"
-echo "OPENVIM"
-echo "-------------------------------"
-echo "cat $DIRNAME/../openvim/openvimd.py|grep ^__version__"
-cat $DIRNAME/../openvim/openvimd.py|grep ^__version__
+echo "openmanod --version"
+openmanod --version
echo
echo "-------------------------------"
echo
@@ -75,13 +62,8 @@
echo "-------------------------------"
echo "OPENMANO"
echo "-------------------------------"
-echo "cat $DIRNAME/../openmano/openmanod.cfg"
-cat $DIRNAME/../openmano/openmanod.cfg
-echo "-------------------------------"
-echo "OPENVIM"
-echo "-------------------------------"
-echo "cat $DIRNAME/../openvim/openvimd.cfg"
-cat $DIRNAME/../openvim/openvimd.cfg
+echo "cat /etc/osm/openmanod.cfg"
+cat /etc/osm/openmanod.cfg
echo "-------------------------------"
echo
@@ -137,34 +119,6 @@
echo "-------------------------------"
done
echo
- echo "-------------------------------"
- echo "OPENVIM$verbose"
- echo "-------------------------------"
- echo "$OVCLIENT config"
- $OVCLIENT config
- echo "-------------------------------"
- echo "$OVCLIENT tenant-list $verbose"
- $OVCLIENT tenant-list $verbose
- echo "-------------------------------"
- echo "$OVCLIENT host-list $verbose"
- $OVCLIENT host-list $verbose
- echo "-------------------------------"
- echo "$OVCLIENT net-list $verbose"
- $OVCLIENT net-list $verbose
- echo "-------------------------------"
- echo "$OVCLIENT port-list $verbose"
- $OVCLIENT port-list $verbose
- echo "-------------------------------"
- echo "$OVCLIENT flavor-list $verbose"
- $OVCLIENT flavor-list $verbose
- echo "-------------------------------"
- echo "$OVCLIENT image-list $verbose"
- $OVCLIENT image-list $verbose
- echo "-------------------------------"
- echo "$OVCLIENT vm-list $verbose"
- $OVCLIENT vm-list $verbose
- echo "-------------------------------"
- echo
done
echo
diff --git a/scripts/python-osm-ro.postinst b/scripts/python-osm-ro.postinst
new file mode 100755
index 0000000..f04a94c
--- /dev/null
+++ b/scripts/python-osm-ro.postinst
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+##
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact with: OSM_TECH@list.etsi.org
+##
+
+echo "POST INSTALL OSM-RO"
+OSMRO_PATH=`python -c 'import osm_ro; print osm_ro.__path__[0]'`
+#OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'`
+
+#Pip packages required for vmware connector
+pip install --upgrade pip
+pip install pyvcloud
+pip install progressbar
+pip install prettytable
+pip install pyvmomi
+
+systemctl enable osm-ro.service
+
+#Creation of log folder
+mkdir -p /var/log/osm
+
+#configure arg-autocomplete for this user
+su $SUDO_USER -c 'activate-global-python-argcomplete --user'
+if ! su $SUDO_USER -c 'grep -q bash_completion.d/python-argcomplete.sh ${HOME}/.bashrc'
+then
+ echo " inserting .bash_completion.d/python-argcomplete.sh execution at .bashrc"
+ su $SUDO_USER -c 'echo ". ${HOME}/.bash_completion.d/python-argcomplete.sh" >> ~/.bashrc'
+fi
+
+echo '
+To make OSM RO work, you have to install mysql and a database, and finally start openmano service'
+echo " ${OSMRO_PATH}/database_utils/install-db-server.sh # -h for help"
+echo ' service openmano start'
+
+
diff --git a/scripts/service-openmano.sh b/scripts/service-openmano
similarity index 95%
rename from scripts/service-openmano.sh
rename to scripts/service-openmano
index 1a48d4a..0224d20 100755
--- a/scripts/service-openmano.sh
+++ b/scripts/service-openmano
@@ -116,7 +116,7 @@
running=y
done
#if installed as a service and it is not provided a screen name call service
- [[ -f /etc/systemd/system/openmano.service ]] && [[ -z $option_screen_name ]] && running=y #&& service openmano status
+ [[ -f /etc/systemd/system/osm-ro.service ]] && [[ -z $option_screen_name ]] && running=y #&& service osm-ro status
if [ -z "$running" ]
then
echo -n " $om_name not running" && [[ -n "$option_screen_name" ]] && echo " on screen '$option_screen_name'" || echo
@@ -124,7 +124,7 @@
fi
#if installed as a service and it is not provided a screen name call service
- [[ -f /etc/systemd/system/openmano.service ]] && [[ -z $option_screen_name ]] && service openmano $om_action && ( [[ $om_action == status ]] || sleep 5 ) && exit $?
+ [[ -f /etc/systemd/system/osm-ro.service ]] && [[ -z $option_screen_name ]] && service osm-ro $om_action && ( [[ $om_action == status ]] || sleep 5 ) && exit $?
#stop