diff options
| -rw-r--r-- | etc/minion.conf | 3 | ||||
| -rw-r--r-- | func/commonconfig.py | 3 | ||||
| -rwxr-xr-x | minion/utils.py | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/etc/minion.conf b/etc/minion.conf index 9630571..e790839 100644 --- a/etc/minion.conf +++ b/etc/minion.conf @@ -1,8 +1,7 @@ # configuration for minions [main] -overlord_server = funcmaster log_level = DEBUG -certmaster = http://certmaster:51235/ +certmaster_server = certmaster cert_dir = /etc/pki/func diff --git a/func/commonconfig.py b/func/commonconfig.py index d8bc144..ab6cc26 100644 --- a/func/commonconfig.py +++ b/func/commonconfig.py @@ -11,7 +11,6 @@ class CMConfig(BaseConfig): autosign = BoolOption(False) class FuncdConfig(BaseConfig): - overlord_server = Option('funcmaster') log_level = Option('INFO') - certmaster = Option('http://certmaster:51235/') + certmaster_server = Option('certmaster') cert_dir = Option('/etc/pki/func') diff --git a/minion/utils.py b/minion/utils.py index fd6eb7d..074d41a 100755 --- a/minion/utils.py +++ b/minion/utils.py @@ -30,7 +30,7 @@ def create_minion_keys(): config_file = '/etc/func/minion.conf' config = read_config(config_file, FuncdConfig) cert_dir = config.cert_dir - master_uri = config.certmaster + master_uri = 'http://%s:51235/' % config.certmaster_server hn = socket.getfqdn() key_file = '%s/%s.pem' % (cert_dir, hn) |