Merge lp:~harlowja/cloud-init/none-ds into lp:~cloud-init-dev/cloud-init/trunk

[Joshua Harlow]

=== modified file 'cloudinit/settings.py'
--- cloudinit/settings.py	2012-08-08 18:36:41 +0000
+++ cloudinit/settings.py	2012-08-20 19:23:42 +0000
@@ -35,7 +35,9 @@
         'OVF',
         'MAAS',
         'Ec2',
-        'CloudStack'
+        'CloudStack',
+        # At the end to act as a 'catch' when none of the above work...
+        'None',
     ],
     'def_log_file': '/var/log/cloud-init.log',
     'log_cfgs': [],

=== added file 'cloudinit/sources/DataSourceNone.py'
--- cloudinit/sources/DataSourceNone.py	1970-01-01 00:00:00 +0000
+++ cloudinit/sources/DataSourceNone.py	2012-08-20 19:23:42 +0000
@@ -0,0 +1,63 @@
+# vi: ts=4 expandtab
+#
+#    Copyright (C) 2012 Yahoo! Inc.
+#
+#    Author: Joshua Harlow <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from cloudinit import log as logging
+from cloudinit import sources
+from cloudinit import util
+
+LOG = logging.getLogger(__name__)
+
+
+class DataSourceNone(sources.DataSource):
+    def __init__(self, sys_cfg, distro, paths, ud_proc=None):
+        sources.DataSource.__init__(self, sys_cfg, distro, paths, ud_proc)
+        self.userdata = {}
+        self.metadata = {}
+        self.userdata_raw = ''
+
+    def get_data(self):
+        # If the datasource config has any provided 'fallback'
+        # userdata or metadata, use it...
+        if 'userdata' in self.ds_cfg:
+            self.userdata = self.ds_cfg['userdata']
+            self.userdata_raw = util.yaml_dumps(self.userdata)
+        if 'metadata' in self.ds_cfg:
+            self.metadata = self.ds_cfg['metadata']
+        return True
+
+    def get_instance_id(self):
+        return 'iid-datasource-none'
+
+    def __str__(self):
+        return util.obj_name(self)
+
+    @property
+    def is_disconnected(self):
+        return True
+
+
+# Used to match classes to dependencies
+datasources = [
+  (DataSourceNone, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)),
+  (DataSourceNone, []),
+]
+
+
+# Return a list of data sources that match this set of dependencies
+def get_datasource_list(depends):
+    return sources.list_from_depends(depends, datasources)

=== modified file 'cloudinit/sources/__init__.py'
--- cloudinit/sources/__init__.py	2012-06-21 15:38:12 +0000
+++ cloudinit/sources/__init__.py	2012-08-20 19:23:42 +0000
@@ -65,6 +65,10 @@
             self.userdata = self.ud_proc.process(raw_data)
         return self.userdata
 
+    @property
+    def is_disconnected(self):
+        return False
+
     def get_userdata_raw(self):
         return self.userdata_raw