From e475bb88ffd917ba4c1a46bddfa270ac614a3d3b Mon Sep 17 00:00:00 2001 From: Jeremy Mordkoff Date: Wed, 13 Dec 2017 16:35:28 -0500 Subject: [PATCH] check if osm agent is configured before deleting Signed-off-by: Jeremy Mordkoff --- installers/install_osm.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/installers/install_osm.sh b/installers/install_osm.sh index 03b652af..550581f0 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -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 \ -- 2.25.1