diff options
Diffstat (limited to 'ec2init/__init__.py')
| -rw-r--r-- | ec2init/__init__.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ec2init/__init__.py b/ec2init/__init__.py index f89839ab..c4923f1b 100644 --- a/ec2init/__init__.py +++ b/ec2init/__init__.py @@ -260,6 +260,15 @@ class EC2Init: f=open(cloud_config, "wb") f.write(self.cloud_config_str) f.close() + + ## this could merge the cloud config with the system config + ## for now, not doing this as it seems somewhat circular + ## as CloudConfig does that also, merging it with this cfg + ## + # ccfg = yaml.load(self.cloud_config_str) + # if ccfg is None: ccfg = { } + # self.cfg = util.mergedict(ccfg, self.cfg) + return self.cloud_config_str+="\n#%s\n%s" % (filename,payload) |