wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle comment on inventory group line.

Browse source
This commit is contained in:
Martynas Mickevicius 2013-10-03 15:49:50 +03:00
parent 44279ce34f
commit 7ecb5fbc9c
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,8 +65,9 @@ class InventoryParser(object):
active_group_name = 'ungrouped'
for line in self.lines:
if line.startswith("[") and line.strip().endswith("]"):
active_group_name = line.split(" #")[0].replace("[","").replace("]","").strip()
line = line.split("#")[0].strip()
if line.startswith("[") and line.endswith("]"):
active_group_name = line.replace("[","").replace("]","")
if line.find(":vars") != -1 or line.find(":children") != -1:
active_group_name = active_group_name.rsplit(":", 1)[0]
if active_group_name not in self.groups:
@ -76,10 +77,10 @@ class InventoryParser(object):
elif active_group_name not in self.groups:
new_group = self.groups[active_group_name] = Group(name=active_group_name)
all.add_child_group(new_group)
elif line.startswith("#") or line.startswith(";") or line == '':
elif line.startswith(";") or line == '':
pass
elif active_group_name:
tokens = shlex.split(line.split(" #")[0])
tokens = shlex.split(line)
if len(tokens) == 0:
continue
hostname = tokens[0]

4
test/TestInventory.py
View file

@ -300,6 +300,10 @@ class TestInventory(unittest.TestCase):
expected_hosts=['1.host','2.host','A.host','B.host']
assert sorted(hosts) == sorted(expected_hosts)
hosts2 = i.list_hosts('test2')
expected_hosts2=['1.host','2.host','3.host']
assert sorted(hosts2) == sorted(expected_hosts2)
###################################################
### Inventory API tests

3
test/inventory/test_leading_range
View file

@ -1,3 +1,6 @@
[test]
[1:2].host
[A:B].host
[test2] # comment
[1:3].host