commit 1b7107ea2035e3bf2da4d7730927d4f5dd1aff52
author garciadeblas <gerardo.garciadeblas@telefonica.com> Thu Dec 21 15:32:02 2017 +0100
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Wed Feb 21 15:55:23 2018 +0200
tree 9f37e12dd069b946bd29754a428ccd9086e129d1
parent b08f8e54ded658e5ff250873956d7411d38ce919

Minor changes in installer to guarantee idempotency in configuration

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

installers/install_osm.sh

diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index d7c895a..947c637 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -212,9 +212,10 @@
     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_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