Merge pull request #7412 from bellkev/fix_skip_dir_inventory_extensions

Fix skip dir inventory extensions

lib/ansible/inventory/dir.py

@@ -40,9 +40,8 @@ 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 any(i.endswith(ext) for ext in ("~", ".orig", ".bak", ".ini", ".retry", ".pyc", ".pyo")):
-                if i.endswith(ext):
+                continue
-                    continue
             # Skip hidden files
             if i.startswith('.') and not i.startswith('./'):
                 continue

test/units/TestInventory.py

@@ -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()]

test/units/inventory_test_data/inventory_dir/4skip_extensions.ini

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