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

Merge pull request #1385 from dhozac/raise-error-for-scripts-too

Browse source 
Raise error for missing hosts in inventory scripts as well
This commit is contained in:
Michael DeHaan 2012-10-19 07:30:01 -07:00
parent 2e3273595a b8021f12e0
commit cde377bddb
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/inventory/__init__.py
View file

@ -266,8 +266,11 @@ class Inventory(object):
def _get_variables(self, hostname): def _get_variables(self, hostname):
host = self.get_host(hostname)
if host is None:
raise errors.AnsibleError("host not found: %s" % hostname)
if self._is_script: if self._is_script:
host = self.get_host(hostname)
cmd = subprocess.Popen( cmd = subprocess.Popen(
[self.host_list,"--host",hostname], [self.host_list,"--host",hostname],
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
@ -283,11 +286,8 @@ class Inventory(object):
results['group_names'] = sorted(groups) results['group_names'] = sorted(groups)
return results return results
else:
host = self.get_host(hostname) return host.get_variables()
if host is None:
raise errors.AnsibleError("host not found: %s" % hostname)
return host.get_variables()
def add_group(self, group): def add_group(self, group):
self.groups.append(group) self.groups.append(group)