From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 21 Dec 2017 14:32:02 +0000 (+0100)
Subject: Minor changes in installer to guarantee idempotency in configuration
X-Git-Tag: v3.0.3~12
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=1b7107ea2035e3bf2da4d7730927d4f5dd1aff52;p=osm%2Fdevops.git

Minor changes in installer to guarantee idempotency in configuration

Change-Id: Ia8ee0990ed2f3d23ff877c8782327de85af8cfef
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index d7c895ac..947c6371 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -212,9 +212,10 @@ function configure_RO(){
     ro_is_up
 
     lxc exec RO -- openmano tenant-delete -f osm >/dev/null
+    lxc exec RO -- openmano tenant-create osm > /dev/null
     lxc exec RO -- sed -i '/export OPENMANO_TENANT=osm/d' .bashrc 
     lxc exec RO -- sed -i '$ i export OPENMANO_TENANT=osm' .bashrc
-    #lxc exec RO -- sh -c 'echo "export OPENMANO_TENANT=osm" >> .bashrc'
+    lxc exec RO -- sh -c 'echo "export OPENMANO_TENANT=osm" >> .bashrc'
 }
 
 function configure_VCA(){
@@ -226,7 +227,7 @@ function configure_VCA(){
 function configure_SOUI(){
     . $OSM_DEVOPS/installers/export_ips
     JUJU_CONTROLLER_IP=`lxc exec VCA -- lxc list -c 4 |grep eth0 |awk '{print $2}'`
-    RO_TENANT_ID=`lxc exec RO -- openmano tenant-create osm |awk '{print $1}'`
+    RO_TENANT_ID=`lxc exec RO -- openmano tenant-list osm |awk '{print $1}'`
 
     echo -e "       Configuring SO"
     sudo route add -host $JUJU_CONTROLLER_IP gw $VCA_CONTAINER_IP