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

Merge pull request #3067 from pol/devel

Browse source 
Remove inline comments from inventory tokenizing.
This commit is contained in:
Michael DeHaan 2013-05-30 13:16:14 -07:00
commit b8630d2bc4
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ class InventoryParser(object):
for line in self.lines: for line in self.lines:
if line.startswith("["): if line.startswith("["):
active_group_name = line.replace("[","").replace("]","").strip() active_group_name = line.split("#")[0].replace("[","").replace("]","").strip()
if line.find(":vars") != -1 or line.find(":children") != -1: if line.find(":vars") != -1 or line.find(":children") != -1:
active_group_name = active_group_name.rsplit(":", 1)[0] active_group_name = active_group_name.rsplit(":", 1)[0]
if active_group_name not in self.groups: if active_group_name not in self.groups:
@ -78,7 +78,7 @@ class InventoryParser(object):
elif line.startswith("#") or line == '': elif line.startswith("#") or line == '':
pass pass
elif active_group_name: elif active_group_name:
tokens = shlex.split(line) tokens = shlex.split(line.split("#")[0])
if len(tokens) == 0: if len(tokens) == 0:
continue continue
hostname = tokens[0] hostname = tokens[0]

8
test/inventory_dir/3comments Normal file
View file

@ -0,0 +1,8 @@
[major-god] # group with inline comments
zeus var_a=1 # host with inline comments
# A comment
thor
[minor-god] # group with inline comment and unbalanced quotes: ' "
morpheus # host with inline comments and unbalanced quotes: ' "
# A comment with unbalanced quotes: ' "