diff options
| author | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-26 22:52:10 -0400 |
|---|---|---|
| committer | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-26 22:52:10 -0400 |
| commit | acf93f862e1f1a6cc19e70d834c4f533006263b1 (patch) | |
| tree | aed5c4f4b4a3221d425c5767138c0c5c77b8da94 /minion/utils.py | |
| parent | 65588b98f4d0c7428903581d8e4c4cd6d62f1223 (diff) | |
| download | third_party-func-acf93f862e1f1a6cc19e70d834c4f533006263b1.tar.gz third_party-func-acf93f862e1f1a6cc19e70d834c4f533006263b1.tar.xz third_party-func-acf93f862e1f1a6cc19e70d834c4f533006263b1.zip | |
minion.conf,config_data.py: add certmaster and cert_dir config
utils.py: make it use the config object
Diffstat (limited to 'minion/utils.py')
| -rwxr-xr-x | minion/utils.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/minion/utils.py b/minion/utils.py index 8b9069c..307141f 100755 --- a/minion/utils.py +++ b/minion/utils.py @@ -22,14 +22,15 @@ import codes import socket import time -#import config_data +import config_data def create_minion_keys(): - #config_obj = config_data.Config() - cert_dir = '/etc/pki/func' # clearly needs to be a config - master_uri = 'http://certmaster:51235/' # clearly needs to be a config + config_obj = config_data.Config() + config = config_obj.get() + cert_dir = config['cert_dir'] + master_uri = config['certmaster'] hn = socket.getfqdn() key_file = '%s/%s.pem' % (cert_dir, hn) |