From 38b81526657c471c486c3f63b7f521cbcb167ee5 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Aug 24 2017 17:57:50 +0000 Subject: [PATCH 1/2] Use list of ignored inventory extensions from environment if present --- diff --git a/scripts/merge-standard-inventory b/scripts/merge-standard-inventory index 4ee0bf0..1b6097f 100755 --- a/scripts/merge-standard-inventory +++ b/scripts/merge-standard-inventory @@ -68,8 +68,11 @@ def merge_standard_inventories(args): inventory_dir = os.environ.get( "TEST_DYNAMIC_INVENTORY_DIRECTORY", "/usr/share/ansible/inventory") - inventory_ignore_extensions = ( - "~", ".orig", ".bak", ".ini", ".cfg", ".retry", ".pyc", ".pyo") + inventory_ignore_extensions = tuple( + s.strip() + for s in os.environ.get("ANSIBLE_INVENTORY_IGNORE", + "~, .orig, .bak, .ini, .cfg, .retry, .pyc, .pyo").split(',') + if bool(s.strip())) merged = Inventory() From 1016cc53afde4232d56c99334fd6a592b4c690e7 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Sep 19 2017 17:19:24 +0000 Subject: [PATCH 2/2] Rewrite ignored inventory extension code to be less fancy. --- diff --git a/scripts/merge-standard-inventory b/scripts/merge-standard-inventory index 1b6097f..b5a288f 100755 --- a/scripts/merge-standard-inventory +++ b/scripts/merge-standard-inventory @@ -68,11 +68,14 @@ def merge_standard_inventories(args): inventory_dir = os.environ.get( "TEST_DYNAMIC_INVENTORY_DIRECTORY", "/usr/share/ansible/inventory") - inventory_ignore_extensions = tuple( - s.strip() - for s in os.environ.get("ANSIBLE_INVENTORY_IGNORE", - "~, .orig, .bak, .ini, .cfg, .retry, .pyc, .pyo").split(',') - if bool(s.strip())) + + ignore_ext_string = os.environ.get( + "ANSIBLE_INVENTORY_IGNORE", "~, .orig, .bak, .ini, .cfg, .retry, .pyc, .pyo") + ignore_ext_list = [] + for s in ignore_ext_string.split(','): + if s.strip(): + ignore_ext_list.append(s.strip()) + inventory_ignore_extensions = tuple(ignore_ext_list) merged = Inventory()