Logging updates, performance tuning
diff --git a/check_versions/common/base_settings.py b/check_versions/common/base_settings.py
index 937c22e..8e10ea6 100644
--- a/check_versions/common/base_settings.py
+++ b/check_versions/common/base_settings.py
@@ -34,7 +34,10 @@
salt_file_root = os.environ.get('SALT_FILE_ROOT', None)
salt_scripts_folder = os.environ.get('SALT_SCRIPTS_FOLDER', 'test_scripts')
- all_nodes = utils.get_nodes_list(os.environ.get('CI_ALL_NODES', None))
+ all_nodes = utils.get_nodes_list(
+ os.environ.get('CI_ALL_NODES', None),
+ os.environ.get('SALT_NODE_LIST_FILE', None)
+ )
skip_nodes = utils.node_string_to_list(os.environ.get(
'CI_SKIP_NODES',
None
diff --git a/check_versions/common/other.py b/check_versions/common/other.py
index 809a9c0..00f67c2 100644
--- a/check_versions/common/other.py
+++ b/check_versions/common/other.py
@@ -67,12 +67,12 @@
else:
raise ConfigException(_message)
- def get_nodes_list(self, env):
+ def get_nodes_list(self, env, nodes_list):
_list = []
if env is None:
# nothing supplied, use the one in repo
try:
- with open(os.path.join(PKG_DIR, 'etc', 'nodes.list')) as _f:
+ with open(os.path.join(PKG_DIR, nodes_list)) as _f:
_list.extend(_f.read().splitlines())
except IOError as e:
raise ConfigException("Error while loading file, '{}': "