config crap in one file so we don't have recursive/impossible imports, I hope

2 files changed, 5 insertions, 9 deletions

diff --git a/minion/server.py b/minion/server.py
index f930cfa..fcfe537 100755
--- a/minion/server.py
+++ b/minion/server.py
@@ -25,7 +25,8 @@ from rhpl.translate import textdomain
 I18N_DOMAIN = "func"
 
 
-from func.config import BaseConfig, BoolOption, IntOption, Option, ConfigError, read_config, ListOption
+from func.config import read_config
+from func.commonconfig import FuncdConfig
 from func import logger
 
 # our modules
@@ -34,11 +35,6 @@ import codes
 import module_loader
 import utils
 
-class FuncdConfig(BaseConfig):
-    overlord_server = Option('funcmaster')
-    log_level = Option('INFO')
-    certmaster = Option('http://certmaster:51235/')
-    cert_dir = Option('/etc/pki/func')
     
 
 class XmlRpcInterface(object):
diff --git a/minion/utils.py b/minion/utils.py
index 5d848b7..fd6eb7d 100755
--- a/minion/utils.py
+++ b/minion/utils.py
@@ -23,12 +23,12 @@ import xmlrpclib
 import codes
 import func
 from func import certs
-from func.config import BaseConfig, BoolOption, IntOption, Option, ConfigError, read_config, ListOption
-import server
+from func.config import read_config
+from func.commonconfig import FuncdConfig
 
 def create_minion_keys():
     config_file = '/etc/func/minion.conf'
-    config = read_config(config_file, server.FuncdConfig)    
+    config = read_config(config_file, FuncdConfig)    
     cert_dir = config.cert_dir
     master_uri = config.certmaster
     hn = socket.getfqdn()