Merge remote branch 'public/integration'

lib/ansible/callbacks.py

@@ -1,4 +1,3 @@
-#!/usr/bin/python -tt
 # (C) 2012, Michael DeHaan, <michael.dehaan@gmail.com>
 
 # This file is part of Ansible

lib/ansible/playbook.py

@@ -457,7 +457,7 @@ class PlayBook(object):
                 SETUP_CACHE[host] = result
 
         if self.extra_vars:
-            extra_vars = utils.parse_kv(shlex.split(self.extra_vars))
+            extra_vars = utils.parse_kv(self.extra_vars)
             for h in self.host_list:
                 try:
                     SETUP_CACHE[h].update(extra_vars)

lib/ansible/runner.py

@@ -160,6 +160,9 @@ class Runner(object):
             cmd.extend(['--extra-vars', extra_vars])
         cmd = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False)
         out, err = cmd.communicate()
+        rc = cmd.returncode
+        if rc:
+            raise errors.AnsibleError("%s: %s" % (host_list, err))
         try:
             groups = utils.json_loads(out)
         except: