Handle deployer errors

drip-deployer/docker_kubernetes.py

@@ -45,6 +45,7 @@ def install_manager(vm):
 		print "%s: ========= Kubernetes Master Installed =========" % (vm.ip)
 	except Exception as e:
 		print '%s: %s' % (vm.ip, e)
+		return "ERROR:"+vm.ip+" "+str(e)
 	ssh.close()
 	return retstr[-1]
 
@@ -68,14 +69,21 @@ def install_worker(join_cmd, vm):
 		print "%s: ========= Kubernetes Slave Installed =========" % (vm.ip)
 	except Exception as e:
 		print '%s: %s' % (vm.ip, e)
+		return "ERROR:"+vm.ip+" "+str(e)
 	ssh.close()
+	return ""
 
 def run(vm_list):
 	for i in vm_list:
 		if i.role == "master": join_cmd = install_manager(i)
-
-	join_cmd = join_cmd.encode()
-	join_cmd = join_cmd.strip()
+        if "ERROR" in join_cmd:
+            return join_cmd
+        else:
+            join_cmd = join_cmd.encode()
+            join_cmd = join_cmd.strip()
 
 	for i in vm_list:
-		if i.role == "slave": install_worker(join_cmd, i)
+		if i.role == "slave": worker_cmd = install_worker(join_cmd, i)
+        if "ERROR" in worker_cmd:
+            return worker_cmd
+        return ""
\ No newline at end of file

drip-deployer/rpc_server.py

@@ -2,7 +2,7 @@
 import pika
 import json
 import os
-
+import time
 
 from vm_info import VmInfo
 import docker_kubernetes
@@ -30,17 +30,21 @@ def handleDelivery(message):
         fo.close()
         vm = VmInfo(ip, user, key, role)
         vm_list.append(vm)
-    docker_kubernetes.run(vm_list)
+    return docker_kubernetes.run(vm_list)
     
 
 def on_request(ch, method, props, body):
-    handleDelivery(body)
-
-    print(" Message %s" % body)
-
-    kuber_file = open(path + "admin.conf", "r")
-    kuber_string = kuber_file.read()
-    kuber_file.close()
+    ret = handleDelivery(body)
+    print ret
+    if "ERROR" in ret:
+        kuber_string = ret
+        res_name = "error"
+    #print(" Message %s" % body)
+    else:
+        res_name = "credential"
+        kuber_file = open(path + "admin.conf", "r")
+        kuber_string = kuber_file.read()
+        kuber_file.close()
 
     response = {}
     outcontent = {}
@@ -50,7 +54,7 @@ def on_request(ch, method, props, body):
     par = {}
     par["url"] = "null"
     par["encoding"] = "UTF-8"
-    par["name"] = "credential"
+    par["name"] = res_name
     par["value"] = kuber_string
     par["attributes"] = "null"
     response["parameters"].append(par)