summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Likins <alikins@redhat.com>2008-11-13 17:17:40 -0500
committerAdrian Likins <alikins@redhat.com>2008-11-13 17:17:40 -0500
commitb90df999499a01a56c5923246b4a17d9186e4273 (patch)
treeafaa549b4ccb9751fee3d5ed739326d9ab0718c7
parentc0062d79da547c3979e948e12e953b56d15ec667 (diff)
downloadfunc-b90df999499a01a56c5923246b4a17d9186e4273.tar.gz
func-b90df999499a01a56c5923246b4a17d9186e4273.tar.xz
func-b90df999499a01a56c5923246b4a17d9186e4273.zip
more func.utils/certmaster.utils changes.
Module was using the wrong utils module and calling methods that didnt exist in the func one.
-rw-r--r--func/minion/modules/overlord.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/func/minion/modules/overlord.py b/func/minion/modules/overlord.py
index 7195019..1b4f549 100644
--- a/func/minion/modules/overlord.py
+++ b/func/minion/modules/overlord.py
@@ -11,7 +11,7 @@
import func_module
import func.overlord.client as fc
from certmaster import certmaster as certmaster
-from func import utils
+from certmaster import utils as cm_utils
class OverlordModule(func_module.FuncModule):
@@ -35,12 +35,12 @@ class OverlordModule(func_module.FuncModule):
cm = certmaster.CertMaster()
current_minions = cm.get_signed_certs()
for current_minion in current_minions:
- if current_minion in utils.get_hostname():
+ if current_minion in cm_utils.get_hostname():
maphash[current_minion] = {} #prevent infinite recursion
else:
next_hop = fc.Overlord(current_minion)
mapresults = next_hop.overlord.map_minions()[current_minion]
- if not utils.is_error(mapresults):
+ if not cm_utils.is_error(mapresults):
maphash[current_minion] = mapresults
else:
maphash[current_minion] = {}