aiee. missed some uses of "func.config". Fix those to use certmaster.config

also missed a use of SSLCommon.

darn grep, must be broken. Yeah, thats it, grep screw up. Nope, not
me. Not me at all.

5 files changed, 5 insertions, 5 deletions

diff --git a/func/overlord/client.py b/func/overlord/client.py
index 79ead06..fd425f8 100755
--- a/func/overlord/client.py
+++ b/func/overlord/client.py
@@ -20,7 +20,7 @@ import func.yaml as yaml
 
 from certmaster.commonconfig import CMConfig
 from certmaster import utils
-from func.config import read_config, CONFIG_FILE
+from certmaster.config import read_config, CONFIG_FILE
 
 import sslclient
 
diff --git a/func/overlord/cmd_modules/call.py b/func/overlord/cmd_modules/call.py
index 6fdd32f..afad071 100644
--- a/func/overlord/cmd_modules/call.py
+++ b/func/overlord/cmd_modules/call.py
@@ -21,7 +21,7 @@ import sys
 
 from func.overlord import client
 from func.overlord import base_command
-from func.config import read_config, BaseConfig, ListOption
+from certmaster.config import read_config, BaseConfig, ListOption
 
 import func.jobthing as jobthing
 
diff --git a/func/overlord/cmd_modules/check.py b/func/overlord/cmd_modules/check.py
index 80913e4..58ecc6c 100644
--- a/func/overlord/cmd_modules/check.py
+++ b/func/overlord/cmd_modules/check.py
@@ -21,7 +21,7 @@ import urllib2
 from func.overlord import base_command
 from func import utils
 from func.minion import sub_process
-from func.config import read_config
+from certmaster.config import read_config
 from certmaster.commonconfig import MinionConfig
 
 
diff --git a/func/overlord/command.py b/func/overlord/command.py
index 6e8e137..c17f060 100644
--- a/func/overlord/command.py
+++ b/func/overlord/command.py
@@ -14,7 +14,7 @@ Command class.
 import optparse
 import sys
 
-from func.config import read_config, CONFIG_FILE
+from certmaster.config import read_config, CONFIG_FILE
 
 from certmaster.commonconfig import CMConfig
 
diff --git a/func/overlord/sslclient.py b/func/overlord/sslclient.py
index 8affced..e9cc4a6 100755
--- a/func/overlord/sslclient.py
+++ b/func/overlord/sslclient.py
@@ -2,7 +2,7 @@ import sys
 import xmlrpclib
 import urllib
 
-from func import SSLCommon
+from certmaster import SSLCommon
 
 
 class SSL_Transport(xmlrpclib.Transport):