3 files changed, 8 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceCloudSigma.py b/cloudinit/sources/DataSourceCloudSigma.py
index f8f94759..d7d4e844 100644
--- a/cloudinit/sources/DataSourceCloudSigma.py
+++ b/cloudinit/sources/DataSourceCloudSigma.py
@@ -56,7 +56,7 @@ class DataSourceCloudSigma(sources.DataSource):
         LOG.debug("determining hypervisor product name via dmi data")
         sys_product_name = util.read_dmi_data("system-product-name")
         if not sys_product_name:
-            LOG.warn("failed to get hypervisor product name via dmi data")
+            LOG.debug("system-product-name not available in dmi data")
             return False
         else:
             LOG.debug("detected hypervisor as %s", sys_product_name)
diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py
index c2fba4d2..74d0e5ec 100644
--- a/cloudinit/sources/DataSourceNoCloud.py
+++ b/cloudinit/sources/DataSourceNoCloud.py
@@ -216,8 +216,11 @@ class DataSourceNoCloud(sources.DataSource):
         if not current:
             return None
 
+        # LP: #1568150 need getattr in the case that an old class object
+        # has been loaded from a pickled file and now executing new source.
+        dirs = getattr(self, 'seed_dirs', [self.seed_dir])
         quick_id = _quick_read_instance_id(cmdline_id=self.cmdline_id,
-                                           dirs=self.seed_dirs)
+                                           dirs=dirs)
         if not quick_id:
             return None
         return quick_id == current
@@ -238,6 +241,8 @@ def _quick_read_instance_id(cmdline_id, dirs=None):
             return fill[iid_key]
 
     for d in dirs:
+        if d is None:
+            continue
         try:
             data = util.pathprefix2dict(d, required=['meta-data'])
             md = util.load_yaml(data['meta-data'])
diff --git a/cloudinit/sources/DataSourceSmartOS.py b/cloudinit/sources/DataSourceSmartOS.py
index 5edab152..6cbd8dfa 100644
--- a/cloudinit/sources/DataSourceSmartOS.py
+++ b/cloudinit/sources/DataSourceSmartOS.py
@@ -242,7 +242,7 @@ class DataSourceSmartOS(sources.DataSource):
         # SDC KVM instances will provide dmi data, LX-brand does not
         if self.smartos_type == 'kvm':
             dmi_info = dmi_data()
-            if dmi_info is False:
+            if dmi_info is None:
                 LOG.debug("No dmidata utility found")
                 return False