diff options
author | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-27 17:45:33 -0400 |
---|---|---|
committer | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-27 17:45:33 -0400 |
commit | 49649c3171b331b70e498fd9721eca485294a725 (patch) | |
tree | af98d25c2021de549338aab953db1e08d1e77f6d /minion/utils.py | |
parent | 05f84c547f8eadb46f70abc9f612a21225ed5994 (diff) | |
download | func-49649c3171b331b70e498fd9721eca485294a725.tar.gz func-49649c3171b331b70e498fd9721eca485294a725.tar.xz func-49649c3171b331b70e498fd9721eca485294a725.zip |
config crap in one file so we don't have recursive/impossible imports, I hope
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() |