Merge branch 'topic/crash_empty_inventory' of https://github.com/quinot/ansible into quinot-topic/crash_empty_inventory

pull/4420/head
James Cammarata 2015-09-16 10:08:43 -04:00
commit e899b8e70d
1 changed files with 7 additions and 2 deletions

View File

@ -86,11 +86,16 @@ class Inventory(object):
self.parser = None self.parser = None
# Always create the 'all' group, even if host_list is
# empty: in this case we will subsequently an the implicit
# 'localhost' to it.
all = Group('all')
self.groups = [ all ]
if host_list is None: if host_list is None:
pass pass
elif isinstance(host_list, list): elif isinstance(host_list, list):
all = Group('all')
self.groups = [ all ]
for h in host_list: for h in host_list:
(host, port) = parse_address(h, allow_ranges=False) (host, port) = parse_address(h, allow_ranges=False)
all.add_host(Host(host, port)) all.add_host(Host(host, port))