diff options
| author | Scott Moser <smoser@ubuntu.com> | 2010-01-22 11:21:16 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2010-01-22 11:21:16 -0500 |
| commit | 1108a511010c4497e94bca78769bef30e3c01dff (patch) | |
| tree | 56623e6a6e274fe27490b7912dac6bbb9b858383 | |
| parent | a177947f41a187ea0c8ddda3bfb037fd3d0806d8 (diff) | |
| download | vyos-cloud-init-1108a511010c4497e94bca78769bef30e3c01dff.tar.gz vyos-cloud-init-1108a511010c4497e94bca78769bef30e3c01dff.zip | |
fix reading of cloudconfig
| -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 |