set up configuration reading

salt/config.py

@@ -0,0 +1,34 @@
+
+# Import python modules
+import os
+import socket
+# Import third party libs
+import yaml
+
+def minion_config(path):
+    '''
+    Reads in the minion configuration file and sets up special options
+    '''
+    opts = {'master': 'mcp',
+            'master_port': '7777',
+            'pki_dir': '/etc/salt/pki',
+            'hostname': socket.getfqdn(),
+            }
+
+    if os.path.isfile(path):
+        opts.update(yaml.load(open(conf, 'r')))
+
+    opts['master_uri'] = 'tcp://' + opts['master'] + ':' + opts['master_port']
+
+    return opts
+
+def master_config(path):
+    '''
+    Reads in the master configuration file and sets up default options
+    '''
+    opts = {}
+
+    if os.path.isfile(path):
+        opts.update(yaml.load(open(conf, 'r')))
+    
+    return opts