Skip to content

Instantly share code, notes, and snippets.

@darkmuggle
Created August 1, 2016 20:33
Show Gist options
  • Save darkmuggle/af3ad2978ae16572f2fb8a297071bc85 to your computer and use it in GitHub Desktop.
Save darkmuggle/af3ad2978ae16572f2fb8a297071bc85 to your computer and use it in GitHub Desktop.
=== modified file 'cloudinit/sources/DataSourceAltCloud.py'
--- cloudinit/sources/DataSourceAltCloud.py 2016-06-16 03:03:11 +0000
+++ cloudinit/sources/DataSourceAltCloud.py 2016-08-01 20:22:09 +0000
@@ -110,12 +110,6 @@
'''
- uname_arch = os.uname()[4]
- if uname_arch.startswith("arm") or uname_arch == "aarch64":
- # Disabling because dmi data is not available on ARM processors
- LOG.debug("Disabling AltCloud datasource on arm (LP: #1243287)")
- return 'UNKNOWN'
-
system_name = util.read_dmi_data("system-product-name")
if not system_name:
return 'UNKNOWN'
=== modified file 'cloudinit/sources/DataSourceCloudSigma.py'
--- cloudinit/sources/DataSourceCloudSigma.py 2016-06-02 19:18:27 +0000
+++ cloudinit/sources/DataSourceCloudSigma.py 2016-08-01 20:22:39 +0000
@@ -45,11 +45,6 @@
Uses dmi data to detect if this instance of cloud-init is running
in the CloudSigma's infrastructure.
"""
- uname_arch = os.uname()[4]
- if uname_arch.startswith("arm") or uname_arch == "aarch64":
- # Disabling because dmi data on ARM processors
- LOG.debug("Disabling CloudSigma datasource on arm (LP: #1243287)")
- return False
LOG.debug("determining hypervisor product name via dmi data")
sys_product_name = util.read_dmi_data("system-product-name")
=== modified file 'cloudinit/sources/DataSourceSmartOS.py'
--- cloudinit/sources/DataSourceSmartOS.py 2016-07-13 22:18:46 +0000
+++ cloudinit/sources/DataSourceSmartOS.py 2016-08-01 20:24:45 +0000
@@ -644,14 +644,8 @@
util.logexc(LOG, "failed establishing content link: %s", e)
-def get_smartos_environ(uname_version=None, product_name=None,
- uname_arch=None):
+def get_smartos_environ(uname_version=None, product_name=None):
uname = os.uname()
- if uname_arch is None:
- uname_arch = uname[4]
-
- if uname_arch.startswith("arm") or uname_arch == "aarch64":
- return None
# SDC LX-Brand Zones lack dmidecode (no /dev/mem) but
# report 'BrandZ virtual linux' as the kernel version
=== modified file 'cloudinit/util.py'
--- cloudinit/util.py 2016-06-16 03:32:22 +0000
+++ cloudinit/util.py 2016-08-01 20:14:31 +0000
@@ -2227,6 +2227,12 @@
If all of the above fail to find a value, None will be returned.
"""
+
+ uname_arch = os.uname()[4]
+ if uname_arch.startswith("arm") or uname_arch == "aarch64":
+ LOG.debug("dmidata is not supported on {0}".format(uname_arch))
+ return None
+
syspath_value = _read_dmi_syspath(key)
if syspath_value is not None:
return syspath_value
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment