check if osm agent is configured before deleting
authorJeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Wed, 13 Dec 2017 21:35:28 +0000 (16:35 -0500)
committerJeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Wed, 13 Dec 2017 21:35:28 +0000 (16:35 -0500)
Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
installers/install_osm.sh

index 03b652a..550581f 100755 (executable)
@@ -241,13 +241,22 @@ function configure_SOUI(){
 
     so_is_up $SO_CONTAINER_IP
 
-    #delete existing config agent (could be there on reconfigure)
-    curl -k --request DELETE \
+    #delete existing config agent if already configured
+    current=$(curl -k --request GET \
       --url https://$SO_CONTAINER_IP:8008/api/config/config-agent/account/osmjuju \
       --header 'accept: application/vnd.yang.data+json' \
       --header 'authorization: Basic YWRtaW46YWRtaW4=' \
       --header 'cache-control: no-cache' \
-      --header 'content-type: application/vnd.yang.data+json' &> /dev/null
+      --header 'content-type: application/vnd.yang.data+json' &> /dev/null)
+
+    if [ "$current" != "{}" ]; then
+        curl -k --request DELETE \
+        --url https://$SO_CONTAINER_IP:8008/api/config/config-agent/account/osmjuju \
+        --header 'accept: application/vnd.yang.data+json' \
+        --header 'authorization: Basic YWRtaW46YWRtaW4=' \
+        --header 'cache-control: no-cache' \
+        --header 'content-type: application/vnd.yang.data+json' &> /dev/null
+    fi
 
     result=$(curl -k --request POST \
       --url https://$SO_CONTAINER_IP:8008/api/config/config-agent \