diff options
| author | Adrian Likins <alikins@redhat.com> | 2007-09-27 17:45:21 -0400 |
|---|---|---|
| committer | Adrian Likins <alikins@redhat.com> | 2007-09-27 17:45:21 -0400 |
| commit | 0cb7282e3592051c5ca060a6f784f9aaae5c01b3 (patch) | |
| tree | a28a2a86f8714a076a702c72bced43028584ab39 /minion/utils.py | |
| parent | e72215dd115786c348fee5b268989e9f5f96c840 (diff) | |
| parent | e8df89330659bf09d6ec10c73ca522881d047cdc (diff) | |
| download | func-0cb7282e3592051c5ca060a6f784f9aaae5c01b3.tar.gz func-0cb7282e3592051c5ca060a6f784f9aaae5c01b3.tar.xz func-0cb7282e3592051c5ca060a6f784f9aaae5c01b3.zip | |
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
Diffstat (limited to 'minion/utils.py')
| -rwxr-xr-x | minion/utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/minion/utils.py b/minion/utils.py index 5d848b7..fd6eb7d 100755 --- a/minion/utils.py +++ b/minion/utils.py @@ -23,12 +23,12 @@ import xmlrpclib import codes import func from func import certs -from func.config import BaseConfig, BoolOption, IntOption, Option, ConfigError, read_config, ListOption -import server +from func.config import read_config +from func.commonconfig import FuncdConfig def create_minion_keys(): config_file = '/etc/func/minion.conf' - config = read_config(config_file, server.FuncdConfig) + config = read_config(config_file, FuncdConfig) cert_dir = config.cert_dir master_uri = config.certmaster hn = socket.getfqdn() |