From 63ba097865e1d038d82a7fa1d6efd282784677f5 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 26 Jan 2010 16:40:10 -0500 Subject: move writing sources.list to CloudConfig. add 'apt_preserve_sources_list' Move the writing of sources.list to CloudConfig. This way we have access to the cloud-config user data. Then, allow the user to specify the archive mirror using 'apt_mirror' key. Now, if specified in cloud-config, that is used, otherwise, we get one from the DataSource. One other change here is adding 'apt_preserve_sources_list'. If set to true, then overwriting of the sources.list with the selected mirror will not be done. --- ec2init/__init__.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'ec2init/__init__.py') 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) -- cgit v1.2.3