X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_osm.sh;h=a599aa7c666527c75898cb7622a2ede615cf7057;hb=e580dd9b3c2b5511f9508243ac01b564f0bdfcd7;hp=d7c895ac0ed7dd6be73746b53dc9075c4208fa1e;hpb=e2c017e4a4f618847e5e5b7dc37670868755c8dc;p=osm%2Fdevops.git

diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index d7c895ac..a599aa7c 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -54,6 +54,11 @@ function uninstall(){
         lxc stop VCA && lxc delete VCA
         lxc stop SO-ub && lxc delete SO-ub
     fi
+    echo -e "\nDeleting imported lxd images if they exist"
+    lxc image show osm-ro &>/dev/null && lxc image delete osm-ro
+    lxc image show osm-vca &>/dev/null && lxc image delete osm-vca
+    lxc image show osm-soui &>/dev/null && lxc image delete osm-soui
+    return 0
 }
 
 #Configure NAT rules, based on the current IP addresses of containers
@@ -212,9 +217,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 +232,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
@@ -383,11 +389,18 @@ function install_from_lxdimages(){
     LXD_IMAGE_DIR="$(mktemp -d -q --tmpdir "osmimages.XXXXXX")"
     trap 'rm -rf "$LXD_IMAGE_DIR"' EXIT
     wget -O $LXD_IMAGE_DIR/osm-ro.tar.gz $LXD_REPOSITORY_BASE/$LXD_RELEASE/osm-ro.tar.gz
+    echo -e "\nDeleting previous lxd images if they exist"
+    lxc image show osm-ro &>/dev/null && lxc image delete osm-ro
+    lxc image show osm-vca &>/dev/null && lxc image delete osm-vca
+    lxc image show osm-soui &>/dev/null && lxc image delete osm-soui
+    echo -e "\nImporting osm-ro"
     lxc image import $LXD_IMAGE_DIR/osm-ro.tar.gz --alias osm-ro
     rm -f $LXD_IMAGE_DIR/osm-ro.tar.gz
     wget -O $LXD_IMAGE_DIR/osm-vca.tar.gz $LXD_REPOSITORY_BASE/$LXD_RELEASE/osm-vca.tar.gz
+    echo -e "\nImporting osm-vca"
     lxc image import $LXD_IMAGE_DIR/osm-vca.tar.gz --alias osm-vca
     rm -f $LXD_IMAGE_DIR/osm-vca.tar.gz
+    echo -e "\nImporting osm-soui"
     wget -O $LXD_IMAGE_DIR/osm-soui.tar.gz $LXD_REPOSITORY_BASE/$LXD_RELEASE/osm-soui.tar.gz
     lxc image import $LXD_IMAGE_DIR/osm-soui.tar.gz --alias osm-soui
     rm -f $LXD_IMAGE_DIR/osm-soui.tar.gz