cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix error handling when pasing output from dynamic inventory

Browse source
This commit is contained in:
Toshio Kuratomi 2015-06-03 11:26:53 -07:00
parent 67d065c758
commit 1c8527044b
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/inventory/script.py
View file

@ -23,6 +23,8 @@ import os
import subprocess import subprocess
import sys import sys
from collections import Mapping
from ansible import constants as C from ansible import constants as C
from ansible.errors import * from ansible.errors import *
from ansible.inventory.host import Host from ansible.inventory.host import Host
@ -62,7 +64,16 @@ class InventoryScript:
all_hosts = {} all_hosts = {}
# not passing from_remote because data from CMDB is trusted # not passing from_remote because data from CMDB is trusted
self.raw = self._loader.load(self.data) try:
self.raw = self._loader.load(self.data)
except Exception as e:
sys.stderr.write(err + "\n")
raise AnsibleError("failed to parse executable inventory script results: %s" % str(e))
if not isinstance(self.raw, Mapping):
sys.stderr.write(err + "\n")
raise AnsibleError("failed to parse executable inventory script results: data needs to be formatted as a json dict" )
self.raw = json_dict_bytes_to_unicode(self.raw) self.raw = json_dict_bytes_to_unicode(self.raw)
all = Group('all') all = Group('all')
@ -70,10 +81,6 @@ class InventoryScript:
group = None group = None
if 'failed' in self.raw:
sys.stderr.write(err + "\n")
raise AnsibleError("failed to parse executable inventory script results: %s" % self.raw)
for (group_name, data) in self.raw.items(): for (group_name, data) in self.raw.items():
# in Ansible 1.3 and later, a "_meta" subelement may contain # in Ansible 1.3 and later, a "_meta" subelement may contain