Add secret-management in Charmed OSM

[osm/devops.git] / jenkins / RO / install

diff --git a/jenkins/RO/install b/jenkins/RO/install
index d2eaf58..4dfb011 100755 (executable)
--- a/jenkins/RO/install
+++ b/jenkins/RO/install
@@ -32,22 +32,16 @@ OSM_load_config
 
 #Release TWO
 
+DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:ocata
 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"
-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
+OSMIM_PATH=`python -c 'import osm_im; print osm_im.__path__[0]'` || FATAL "python-osm-im was not properly installed"
+OSMLIBOVIM_PATH=`python -c 'import lib_osm_openvim; print lib_osm_openvim.__path__[0]'` || FATAL "python-lib-osm-openvim was not properly installed"
+OSMRO_PATH=`python -c 'import osm_ro; print osm_ro.__path__[0]'` || FATAL "python-osm-ro was not properly installed"
 
-DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server
-
-${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"
+DEBIAN_FRONTEND=noninteractive ${OSMRO_PATH}/database_utils/install-db-server.sh --updatedb || FATAL "osm-ro db installation failed"
+DEBIAN_FRONTEND=noninteractive ${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
 
 RC=$?