From: root <root@ip-172-31-38-128.ec2.internal>
Date: Fri, 17 Oct 2014 19:28:29 +0000 (-0400)
Subject: Bug fix in ansible driver for backend
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=46d7235737f8637232b33bdde8ff683e86ea95d7;p=plstackapi.git

Bug fix in ansible driver for backend
---

diff --git a/planetstack/openstack_observer/ansible.py b/planetstack/openstack_observer/ansible.py
index 89fb044..5eec7d9 100755
--- a/planetstack/openstack_observer/ansible.py
+++ b/planetstack/openstack_observer/ansible.py
@@ -28,7 +28,7 @@ def parse_output(msg):
 	elif (l.startswith(magic_str2)):
 	    w = len(magic_str2)
 	    str = l[w:]
-	    d = json.loads(magic_str2)
+	    d = json.loads(str)
 	    results.append(d)
 
 
@@ -46,7 +46,11 @@ def run_template(name, opts):
     msg = run.read()
     status = run.close()
 
-    ok_results = parse_output(msg)
+    try:
+    	ok_results = parse_output(msg)
+    except ValueError,e:
+	print str(e)
+	raise e
     return ok_results
 
 def main():