From 53074020e60c9cd39c32a31fac57ac58e6811146 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 27 Apr 2017 12:14:11 +0200 Subject: [PATCH] Updated RO install to update db and load properly the service Change-Id: I4a186bdfab70e802a616a32d786a3dec71e1d3f0 Signed-off-by: garciadeblas --- jenkins/RO/install | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/jenkins/RO/install b/jenkins/RO/install index 8e54f29b..049767a5 100755 --- a/jenkins/RO/install +++ b/jenkins/RO/install @@ -27,25 +27,6 @@ export OSM_MDG=RO OSM_load_config # Installation starts here -apt-get update - -apt-get -y install python-pip -pip install --upgrade pip -pip install pyvcloud -pip install progressbar -pip install prettytable -pip install pyvmomi - -#Dependencies below will be installed directly from packages and must be removed -#apt-get -y install libmysqlclient-dev libssl-dev libffi-dev mysql-client -#apt-get -y install python-yaml python-bottle python-mysqldb python-jsonschema python-paramiko python-argcomplete python-requests python-logutils -#apt-get -y install python-cinderclient python-glanceclient python-keystoneclient python-neutronclient python-novaclient python-mysqldb python-yaml -#apt-get -y install python-boto - -#Release ONE -#curl https://osm-download.etsi.org/repository/osm/debian/ReleaseONE/OSM%20ETSI%20Release%20Key.gpg |apt-key add - -#add-apt-repository -y "deb https://osm-download.etsi.org/repository/osm/debian/ReleaseONE unstable RO openvim" -#add-apt-repository -y "deb https://osm-download.etsi.org/repository/osm/debian/ReleaseONE stable RO openvim" #Release TWO curl https://osm-download.etsi.org/repository/osm/debian/ReleaseTWO/OSM%20ETSI%20Release%20Key.gpg |apt-key add - @@ -55,10 +36,17 @@ apt-get update apt-get -y install python-lib-osm-openvim apt-get -y install python-osm-ro -OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'` || FATAL "lib-osm-openvim was not properly installed" +OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'` || FATAL "lib-osm-openvim was not properly installed" OSMRO_PATH=`python -c 'import osm_ro; print osm_ro.__path__[0]'` || FATAL "osm-ro was not properly installed" +sed -i "s/\${DIRNAME}\/\.\.\/openmanod\ -v/openmanod\ -v/g" /usr/lib/python2.7/dist-packages/osm_ro/database_utils/migrate_mano_db.sh +systemctl disable osm-ro.service +sed -i "/User=/d" /etc/systemd/system/osm-ro.service +sed -i "s/ExecStart=openmanod/ExecStart=\/usr\/bin\/openmanod/" /etc/systemd/system/osm-ro.service +systemctl enable osm-ro.service + +DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server -${OSMRO_PATH}/database_utils/install-db-server.sh --updatedb || FATAL "osm-ro db installation failed" +${OSMRO_PATH}/database_utils/install-db-server.sh --updatedb --no-install-packages || FATAL "osm-ro db installation failed" ${OSMLIBOVIM_PATH}/database_utils/install-db-server.sh -u mano -p manopw -d mano_vim_db --updatedb || FATAL "lib-osm-openvim db installation failed" service osm-ro restart -- 2.25.1