From 1108a511010c4497e94bca78769bef30e3c01dff Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 22 Jan 2010 11:21:16 -0500
Subject: fix reading of cloudconfig

---
 ec2init/CloudConfig.py | 3 +--
 ec2init/util.py        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'ec2init')

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
-- 
cgit v1.2.3