From 7b2fc4e014e6b7a43e6b8fc719d82c3d0b0a8bed Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Wed, 4 Apr 2012 21:35:32 -0400
Subject: initial checkin of kernel commandline cloud-config url support

---
 cloudinit/__init__.py | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'cloudinit/__init__.py')

diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py
index 6d276d84..0b46dde9 100644
--- a/cloudinit/__init__.py
+++ b/cloudinit/__init__.py
@@ -137,7 +137,27 @@ class CloudInit:
 
         if ds_deps != None:
             self.ds_deps = ds_deps
+
         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):
@@ -639,3 +659,27 @@ class InternalPartHandler:
 
     def handle_part(self, data, ctype, filename, payload, frequency):
         return(self.handler(data, ctype, filename, payload, frequency))
+
+
+def get_cmdline_url(names=('cloud-config-url', 'url'),
+                    starts="#cloud-config", cmdline=None):
+
+    if cmdline == None:
+        cmdline = util.get_cmdline()
+
+    data = util.keyval_str_to_dict(cmdline)
+    url = None
+    key = None
+    for key in names:
+        if key in data:
+            url = data[key]
+            break
+    if url == None:
+        return (None, None, None)
+
+    contents = util.readurl(url)
+
+    if contents.startswith(starts):
+        return (key, url, contents)
+
+    return (key, url, None)
-- 
cgit v1.2.3


From 67fe09104cb347c03ea608c72a1382e8ea252b1d Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 5 Apr 2012 00:08:42 -0400
Subject: 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.
---
 cloud-init.py         | 26 ++++++++++++++++++++++++++
 cloudinit/__init__.py | 18 ------------------
 2 files changed, 26 insertions(+), 18 deletions(-)

(limited to 'cloudinit/__init__.py')

diff --git a/cloud-init.py b/cloud-init.py
index 9e0a0405..db620502 100755
--- a/cloud-init.py
+++ b/cloud-init.py
@@ -28,6 +28,7 @@ import cloudinit.CloudConfig as CC
 import cloudinit.DataSource as ds
 import cloudinit.netinfo as netinfo
 import time
+import traceback
 import logging
 import errno
 import os
@@ -67,6 +68,26 @@ def main():
         warn("unable to open /proc/uptime\n")
         uptime = "na"
 
+    cmdline_msg = None
+    cmdline_exc = None
+    if cmd == "start":
+        target = "%s.d/%s" % (cloudinit.system_config,
+            "91_kernel_cmdline_url.cfg")
+        if os.path.exists(target):
+            cmdline_msg = "cmdline: %s existed" % target
+        else:
+            try:
+                (key, url, content) = cloudinit.get_cmdline_url()
+                if key and content:
+                    util.write_file(target, content, mode=0600)
+                    cmdline_msg = ("cmdline: wrote %s from %s, %s" %
+                        (target, key, url))
+                elif key:
+                    cmdline_msg = ("cmdline: %s, %s had no cloud-config" %
+                        (key, url))
+            except Exception:
+                cmdline_exc = traceback.format_exc()
+
     try:
         cfg = cloudinit.get_base_cfg(cfg_path)
     except Exception as e:
@@ -86,6 +107,11 @@ def main():
     cloudinit.logging_set_from_cfg(cfg)
     log = logging.getLogger()
 
+    if cmdline_exc:
+        log.warn(cmdline_exc)
+    elif cmdline_msg:
+        log.debug(cmdline_msg)
+
     try:
         cloudinit.initfs()
     except Exception as e:
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):
-- 
cgit v1.2.3