salt: T2382: id and master nodes are mandatory - use in verify()

1 files changed, 9 insertions, 0 deletions

diff --git a/src/conf_mode/salt-minion.py b/src/conf_mode/salt-minion.py
index 78eda08f3..55139dca1 100755
--- a/src/conf_mode/salt-minion.py
+++ b/src/conf_mode/salt-minion.py
@@ -78,6 +78,15 @@ def get_config():
     return salt
 
 def verify(salt):
+    if not salt:
+        return None
+
+    if not salt['salt_id']:
+        raise ConfigError('Missing mandatory salt id!')
+
+    if not salt['master']:
+        raise ConfigError('Salt master must be defined!')
+
     return None
 
 def generate(salt):