summaryrefslogtreecommitdiffstats
path: root/func
diff options
context:
space:
mode:
authorAdrian Likins <alikins@grimlock.devel.redhat.com>2008-02-25 16:43:24 -0500
committerAdrian Likins <alikins@grimlock.devel.redhat.com>2008-02-25 16:43:24 -0500
commit8c010cb5f810c015291099aaeaee6de86ed84ff1 (patch)
tree1775e2eae5698f0be5ed5c47b4159331070c0654 /func
parente4c5149534ca97e362f91719d6b492c72048880f (diff)
downloadthird_party-func-8c010cb5f810c015291099aaeaee6de86ed84ff1.tar.gz
third_party-func-8c010cb5f810c015291099aaeaee6de86ed84ff1.tar.xz
third_party-func-8c010cb5f810c015291099aaeaee6de86ed84ff1.zip
use certmaster.requester.request_cert instead of utils.create_minion_certs
Diffstat (limited to 'func')
-rwxr-xr-xfunc/minion/server.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/func/minion/server.py b/func/minion/server.py
index 2fa175a..531ac7a 100755
--- a/func/minion/server.py
+++ b/func/minion/server.py
@@ -28,7 +28,6 @@ from func.commonconfig import FuncdConfig
from func import logger
from func import certs
import func.jobthing as jobthing
-import utils
# our modules
import AuthedXMLRPCServer
@@ -36,6 +35,8 @@ import codes
import module_loader
import func.utils as futils
+from certmaster import utils
+from certmaster import requester
class XmlRpcInterface(object):
@@ -271,7 +272,7 @@ def main(argv):
print "serving...\n"
try:
- utils.create_minion_keys()
+ requester.request_cert()
serve()
except codes.FuncException, e:
print >> sys.stderr, 'error: %s' % e