diff options
Diffstat (limited to 'cloudinit/__init__.py')
| -rw-r--r-- | cloudinit/__init__.py | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py index 61cbc3cc..d8f2c8c9 100644 --- a/cloudinit/__init__.py +++ b/cloudinit/__init__.py @@ -123,7 +123,7 @@ log = logging.getLogger(logger_name) log.addHandler(NullHandler()) def logging_set_from_cfg_file(cfg_file=system_config): - logging_set_from_cfg(util.get_base_cfg(cfg_file)) + logging_set_from_cfg(util.get_base_cfg(cfg_file,cfg_builtin)) def logging_set_from_cfg(cfg, logfile=None): if logfile is None: @@ -181,15 +181,7 @@ class CloudInit: if self.cfg: return(self.cfg) - conf = { } - try: - stream = file(self.sysconfig) - conf = yaml.load(stream) - stream.close() - except: - pass - - if conf is None: conf = { } + conf = util.get_base_cfg(system_config,cfg_builtin) # support reading the old ConfigObj format file and merging # it into the yaml dictionary @@ -201,9 +193,6 @@ class CloudInit: except: pass - if not conf.has_key("cloud_type"): - conf["cloud_type"]=None - return(conf) def restore_from_cache(self): |