Add timeout for salt calls
diff --git a/cvp_checks/global_config.yaml b/cvp_checks/global_config.yaml
index 927a232..4de94ce 100644
--- a/cvp_checks/global_config.yaml
+++ b/cvp_checks/global_config.yaml
@@ -14,11 +14,18 @@
SALT_USERNAME: <salt_usr>
SALT_PASSWORD: <salt_pwd>
+# How many seconds to wait for salt-minion to respond
+salt_timeout: 1
+
# List of nodes (full fqdn) to skip in all tests
+# Use as env variable as
+# export skipped_nodes=mtr01.local,log02.local
# TEMPORARY: please do not comment this setting.
skipped_nodes: [""]
# List of groups (short name, e.g. dbs) to skip in group tests
+# Use as env variable as
+# export skipped_groups=mtr,log
# TEMPORARY: please do not comment this setting.
skipped_groups: [""]
@@ -33,4 +40,4 @@
# this test may skip specific node (use fqdn)
test_ntp_sync:
{ #"skipped_nodes": [""],
- "time_deviation": 1}
+ "time_deviation": 5}
diff --git a/cvp_checks/utils/__init__.py b/cvp_checks/utils/__init__.py
index 3c485c5..35aa54e 100644
--- a/cvp_checks/utils/__init__.py
+++ b/cvp_checks/utils/__init__.py
@@ -11,7 +11,8 @@
login_payload = {'username': config['SALT_USERNAME'],
'password': config['SALT_PASSWORD'], 'eauth': 'pam'}
accept_key_payload = {'fun': fun, 'tgt': tgt, 'client': 'local',
- 'expr_form': expr_form, 'tgt_type': tgt_type}
+ 'expr_form': expr_form, 'tgt_type': tgt_type,
+ 'timeout': config['salt_timeout']}
if param:
accept_key_payload['arg'] = param