When a host list is used, no parser is present

pull/2139/head
Daniel Hokka Zakrisson 12 years ago
parent b130716b61
commit 1784fd80cc

@ -67,6 +67,7 @@ class Inventory(object):
host_list = [ h for h in host_list if h and h.strip() ] host_list = [ h for h in host_list if h and h.strip() ]
if type(host_list) == list: if type(host_list) == list:
self.parser = None
all = Group('all') all = Group('all')
self.groups = [ all ] self.groups = [ all ]
for x in host_list: for x in host_list:
@ -281,6 +282,7 @@ class Inventory(object):
vars.update(updated) vars.update(updated)
vars.update(host.get_variables()) vars.update(host.get_variables())
if self.parser is not None:
vars.update(self.parser.get_host_variables(host)) vars.update(self.parser.get_host_variables(host))
return vars return vars

Loading…
Cancel
Save