diff options
Diffstat (limited to 'func/overlord')
| -rw-r--r-- | func/overlord/cmd_modules/check.py | 10 |
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 |