summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-04-12 12:57:50 -0400
committerScott Moser <smoser@ubuntu.com>2016-04-12 12:57:50 -0400
commit5cfe3d6fa2d50a68f9b6c7ceb4b9d5db09687782 (patch)
treec9b8fd7a09e9c5aef124fe270eb4d6de80b9ee83
parentcc549350c6010908add773a8b74e5d1ac840bbf1 (diff)
downloadvyos-cloud-init-5cfe3d6fa2d50a68f9b6c7ceb4b9d5db09687782.tar.gz
vyos-cloud-init-5cfe3d6fa2d50a68f9b6c7ceb4b9d5db09687782.zip
SmartOS, CloudSigma: fix error when dmi data is not availble
In Cloudsigma, the datasource would warn if no product id was availble. SmartOS would log exception. This fixes both of those, changing the warning to a debug message. LP: #1569469
-rw-r--r--cloudinit/sources/DataSourceCloudSigma.py2
-rw-r--r--cloudinit/sources/DataSourceSmartOS.py2
2 files changed, 2 insertions, 2 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/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