sdc-backend-init does not restart on healthcheck failure

Issue-ID: SDC-3063
Change-Id: I6c4a796f42060832ee8a37a708dedda7e7e98c70
Signed-off-by: Ofir Sonsino <os0695@intl.att.com>

diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb
index 0a551f2..cd36fbd 100644 (file)
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/recipes/2_check_Backend.rb
@@ -23,4 +23,5 @@ bash "executing-check_Backend_Health" do
      rc=$?
      if [[ $rc != 0 ]]; then exit $rc; fi
    EOH
+  returns [0]
 end
\ No newline at end of file

diff --git a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb
index eb77f93..bcacf88 100644 (file)
--- a/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb
+++ b/catalog-be/sdc-backend-init/chef-repo/cookbooks/sdc-catalog-be-setup/templates/default/check_Backend_Health.py.erb
@@ -3,6 +3,7 @@ import subprocess
 #from time import sleep
 import time
 from datetime import datetime
+import sys
 
 beStat=0
 BE_IP="<%= @be_ip %>"
@@ -48,4 +49,4 @@ for i in range(1,10):
 
 if beStat == 0:
     print '[ERROR]: ' + time.strftime('%Y/%m/%d %H:%M:%S') + bcolors.FAIL + 'Backend is DOWN :-(' + bcolors.ENDC
-    exit()
\ No newline at end of file
+    sys.exit(1)
\ No newline at end of file