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

Merge pull request #7412 from bellkev/fix_skip_dir_inventory_extensions

Browse source 
Fix skip dir inventory extensions
This commit is contained in:
James Cammarata 2014-05-19 23:14:22 -05:00
commit 1f0be3753d
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/inventory/dir.py
View file

@ -40,8 +40,7 @@ class InventoryDirectory(object):
for i in self.names:
# Skip files that end with certain extensions or characters
for ext in ("~", ".orig", ".bak", ".ini", ".retry", ".pyc", ".pyo"):
if i.endswith(ext):
if any(i.endswith(ext) for ext in ("~", ".orig", ".bak", ".ini", ".retry", ".pyc", ".pyo")):
continue
# Skip hidden files
if i.startswith('.') and not i.startswith('./'):

4
test/units/TestInventory.py
View file

@ -439,3 +439,7 @@ class TestInventory(unittest.TestCase):
actual_host_names = [host.name for host in group_greek]
print "greek : %s " % actual_host_names
assert actual_host_names == ['zeus', 'morpheus']
def test_dir_inventory_skip_extension(self):
inventory = self.dir_inventory()
assert 'skipme' not in [h.name for h in inventory.get_hosts()]

2
test/units/inventory_test_data/inventory_dir/4skip_extensions.ini Normal file
View file

@ -0,0 +1,2 @@
[skip]
skipme