summaryrefslogtreecommitdiffstats
path: root/func
diff options
context:
space:
mode:
authorAdrian Likins <alikins@grimlock.devel.redhat.com>2008-03-04 17:56:47 -0500
committerAdrian Likins <alikins@grimlock.devel.redhat.com>2008-03-04 17:56:47 -0500
commit7bff89141d9547e4b95049cf4322a78277d451ed (patch)
treec9f6998dc90c19ec7f9a544a19ea1370df20bee4 /func
parent5b79de1dcc30f67efd5859e886fed89158f6c88e (diff)
downloadthird_party-func-7bff89141d9547e4b95049cf4322a78277d451ed.tar.gz
third_party-func-7bff89141d9547e4b95049cf4322a78277d451ed.tar.xz
third_party-func-7bff89141d9547e4b95049cf4322a78277d451ed.zip
missed some bits in the certmaster/func conversion. Use MinionConfig instead
of FuncdConfig
Diffstat (limited to 'func')
-rw-r--r--func/overlord/cmd_modules/check.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/func/overlord/cmd_modules/check.py b/func/overlord/cmd_modules/check.py
index ce84792..446e6de 100644
--- a/func/overlord/cmd_modules/check.py
+++ b/func/overlord/cmd_modules/check.py
@@ -23,7 +23,7 @@ from func.overlord import client
from func import utils
from func.minion import sub_process
from func.config import read_config
-from func.commonconfig import FuncdConfig
+from certmaster.commonconfig import MinionConfig
# FIXME: don't hardcode this here
DEFAULT_PORT = 51234
@@ -123,11 +123,11 @@ class CheckAction(client.command.Command):
def check_talk_to_certmaster(self):
config_file = '/etc/certmaster/minion.conf'
- config = read_config(config_file, FuncdConfig)
- cert_dir = config.cert_dir
+ minion_config = read_config(config_file, MinionConfig)
+ cert_dir = minion_config.cert_dir
# FIXME: don't hardcode port
- master_uri = "http://%s:51235/" % config.certmaster
- print "* this minion is configured in /etc/certmaster/minion.conf to talk to host '%s' for certs, verify that is correct" % config.certmaster
+ master_uri = "http://%s:51235/" % minion_config.certmaster
+ print "* this minion is configured in /etc/certmaster/minion.conf to talk to host '%s' for certs, verify that is correct" % minion_config.certmaster
# this will be a 501, unsupported GET, but we should be
# able to tell if we can make contact
connect_ok = True