diff options
Diffstat (limited to 'ec2init/CloudConfig.py')
| -rw-r--r-- | ec2init/CloudConfig.py | 3 |
1 files changed, 1 insertions, 2 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 |