diff options
| -rw-r--r-- | ec2init/CloudConfig.py | 3 | ||||
| -rw-r--r-- | ec2init/util.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ec2init/CloudConfig.py b/ec2init/CloudConfig.py index 96273e70..9c58246f 100644 --- a/ec2init/CloudConfig.py +++ b/ec2init/CloudConfig.py @@ -42,8 +42,7 @@ class CloudConfig(): f=file(cfgfile) cfg=yaml.load(f.read()) f.close() - util.mergedict(cfg,self.cloud.read_cfg) - return(cfg) + return(util.mergedict(cfg,self.cloud.cfg)) def convert_old_config(self): # support reading the old ConfigObj format file and turning it diff --git a/ec2init/util.py b/ec2init/util.py index 8b36274e..c1da0e71 100644 --- a/ec2init/util.py +++ b/ec2init/util.py @@ -25,5 +25,5 @@ def mergedict(src,cand): if k not in src: src[k] = v else: - src[k] = merge(src[k],v) + src[k] = mergedict(src[k],v) return src |