summaryrefslogtreecommitdiff
path: root/cloudinit/__init__.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-04-05 00:08:42 -0400
committerScott Moser <smoser@ubuntu.com>2012-04-05 00:08:42 -0400
commit67fe09104cb347c03ea608c72a1382e8ea252b1d (patch)
tree3adeab772dcda3ecd70798ca461272e11ce7d2b0 /cloudinit/__init__.py
parent166edf79d06fb94856c7c7401914c94149cecbc6 (diff)
downloadvyos-cloud-init-67fe09104cb347c03ea608c72a1382e8ea252b1d.tar.gz
vyos-cloud-init-67fe09104cb347c03ea608c72a1382e8ea252b1d.zip
move the reading of the cmdline cloud-config url to cloud-init.py
The reason for moving this from cloudinit/__init__.py was that it was running too late there. The cloudinit.parsed_cfgs variable was already filled by cloud-init.py's reading of cloud config. I'm sure I had done this so that it would not have to re-parse configs. I think the right way to handle this is to move that logic back to cloudinit/__init__.py and add some function like 'reread_configs()' that would re-read all releavent cofnigs and re-setup logging. That seemed more error prone at the moment, with limited time.
Diffstat (limited to 'cloudinit/__init__.py')
-rw-r--r--cloudinit/__init__.py18
1 files changed, 0 insertions, 18 deletions
diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py
index 0b46dde9..85c6fd1b 100644
--- a/cloudinit/__init__.py
+++ b/cloudinit/__init__.py
@@ -140,24 +140,6 @@ class CloudInit:
self.sysconfig = sysconfig
- if DataSource.DEP_NETWORK in self.ds_deps:
- target = "%s.d/%s" % (self.sysconfig, "91_kernel_cmdline_url.cfg")
- if os.path.exists(target):
- log.debug("cmdline: %s existed" % target)
- else:
- try:
- (key, url, content) = get_cmdline_url()
- if key and content:
- util.write_file(target, content, mode=0600)
- log.debug("cmdline: wrote %s from %s, %s" %
- (target, key, url))
- elif key:
- log.debug("cmdline: %s, %s had no cloud-config" %
- (key, url))
- except Exception:
- util.logexc(log)
- log.warn("cmdline: exception occurred while reading")
-
self.cfg = self.read_cfg()
def read_cfg(self):