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

Fix hostname expansion bug in inventory parser

Browse source
This commit is contained in:
Junegunn Choi 2012-12-16 01:49:12 +09:00
parent 23f2a7fc7e
commit 7fbb7e079a
3 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/ansible/inventory/ini.py
View file

@ -93,28 +93,24 @@ class InventoryParser(object):
hostname = tokens2[0]
port = tokens2[1]
host = None
_all_hosts = []
if hostname in self.hosts:
host = self.hosts[hostname]
_all_hosts.append(host)
else:
hostnames = []
if detect_range(hostname):
_hosts = expand_hostname_range(hostname)
for _ in _hosts:
host = Host(name=_, port=port)
self.hosts[_] = host
_all_hosts.append(host)
hostnames = expand_hostname_range(hostname)
else:
host = Host(name=hostname, port=port)
self.hosts[hostname] = host
_all_hosts.append(host)
hostnames = [hostname]
for hn in hostnames:
host = None
if hn in self.hosts:
host = self.hosts[hn]
else:
host = Host(name=hn, port=port)
self.hosts[hn] = host
if len(tokens) > 1:
for t in tokens[1:]:
(k,v) = t.split("=")
host.set_variable(k,v)
for _ in _all_hosts:
self.groups[active_group_name].add_host(_)
self.groups[active_group_name].add_host(host)
# [southeast:children]
# atlanta

11
test/TestInventory.py
View file

@ -150,6 +150,17 @@ class TestInventory(unittest.TestCase):
print expected
assert vars == expected
def test_complex_group_names(self):
inventory = self.complex_inventory()
tests = {
'host1': [ 'role1' ],
'host2': [ 'role1', 'role2' ],
'host3': [ 'role2' ]
}
for host, roles in tests.iteritems():
group_names = inventory.get_variables(host)['group_names']
assert sorted(group_names) == sorted(roles)
def test_complex_exclude(self):
inventory = self.complex_inventory()
hosts = inventory.list_hosts("nc:florida:!triangle:!orlando")

5
test/complex_hosts
View file

@ -73,4 +73,9 @@ d=100002
[us:vars]
c=1000000
[role1]
host[1:2]
[role2]
host[2:3]