cloud-init-dev team mailing list archive

[Robert Schweikert <rjschwei@xxxxxxxx>]

Robert Schweikert has proposed merging ~rjschwei/cloud-init:nodmidcodeppc64 into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~rjschwei/cloud-init/+git/cloud-init/+merge/305638

demidecode is not available on POWER (ppc) thus just as on ARM we should write an appropriate log message.
-- 
Your team cloud init development team is requested to review the proposed merge of ~rjschwei/cloud-init:nodmidcodeppc64 into cloud-init:master.

diff --git a/cloudinit/util.py b/cloudinit/util.py
index 7c37eb8..557e601 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -2337,7 +2337,11 @@ def read_dmi_data(key):
 
     # running dmidecode can be problematic on some arches (LP: #1243287)
     uname_arch = os.uname()[4]
-    if uname_arch.startswith("arm") or uname_arch == "aarch64":
+    if (
+            uname_arch.startswith("arm") or
+            uname_arch == "aarch64" or
+            uname_arch.startswith("ppc")
+    ):
         LOG.debug("dmidata is not supported on %s", uname_arch)
         return None