From ceff5f034fd0a826dbd04c058989ed72ba3960a0 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 17 Jun 2010 12:41:12 -0400 Subject: remove use of cloudinit constants from util.py in get_base_cfg use get_base_cfg from CloudInit:read_cfg --- cloudinit/util.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'cloudinit/util.py') diff --git a/cloudinit/util.py b/cloudinit/util.py index 79115355..0cee8e17 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -33,9 +33,12 @@ def read_conf(fname): return { } raise -def get_base_cfg(cfgfile=cloudinit.system_config): +def get_base_cfg(cfgfile,cfg_builtin=""): syscfg = read_conf(cfgfile) - builtin = yaml.load(cloudinit.cfg_builtin) + if cfg_builtin: + builtin = yaml.load(cfg_builtin) + else: + return(syscfg) return(mergedict(syscfg,builtin)) def get_cfg_option_bool(yobj, key, default=False): -- cgit v1.2.3