replace DataSource's self.log

After adding the 'log' element to the DataSource class, pickling would
fail with 
  TypeError: can't pickle file objects

Instead of having the object with a log reference, use one from 
'DataSource.log' and have that set by cloudinit

1 files changed, 2 insertions, 1 deletions

diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py
index 7406e19f..47e4e10a 100644
--- a/cloudinit/__init__.py
+++ b/cloudinit/__init__.py
@@ -102,6 +102,7 @@ def logging_set_from_cfg(cfg):
 
 
 import DataSource
+DataSource.setlog(log)
 import UserDataHandler
 
 class CloudInit:
@@ -190,7 +191,7 @@ class CloudInit:
         for cls in dslist:
             ds = cls.__name__
             try:
-                s = cls(log)
+                s = cls()
                 if s.get_data():
                     self.datasource = s
                     self.datasource_name = ds