cloud-init-dev team mailing list archive

["Mark T. Voelker" <markvoelker@xxxxxxxxx>]

Mark T. Voelker has proposed merging ~mvoelker/cloud-init:id_vmware_openstack into cloud-init:master.

Commit message:
Allow identification of OpenStack by Asset 

When OpenStack is deployed on some hypervisors (such as VMware
vSphere), cloud-init doesn't detect that it needs to probe the
metadata service because the DMI product name field can't be set
to a field that is recognized by cloud-init.  However, the asset
tag field can be set via flavor extra specs or image metadata.
A similar approach is already used to identify Open Telekom Cloud.

This patch allows cloud init to recognize "OpenStack Nova" or
"OpenStack Compute" in the asset tag field as an indication that
the instance being configured is running on an OpenStack platform.

LP: #1669875

Requested reviews:
  cloud-init commiters (cloud-init-dev)
Related bugs:
  Bug #1669875 in cloud-init: "identify openstack vmware platform"
  https://bugs.launchpad.net/cloud-init/+bug/1669875

For more details, see:
https://code.launchpad.net/~mvoelker/cloud-init/+git/cloud-init/+merge/367129
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~mvoelker/cloud-init:id_vmware_openstack into cloud-init:master.

diff --git a/tools/ds-identify b/tools/ds-identify
index 6518901..ec29fb4 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -979,6 +979,14 @@ dscheck_OpenStack() {
         return ${DS_FOUND}
     fi
 
+    # LP: #1669875 : allow identification of OpenStack by asset tag
+    if dmi_chassis_asset_tag_matches "OpenStack Nova"; then
+        return ${DS_FOUND}
+    fi
+    if dmi_chassis_asset_tag_matches "OpenStack Compute"; then
+        return ${DS_FOUND}
+    fi
+
     # LP: #1715241 : arch other than intel are not identified properly.
     case "$DI_UNAME_MACHINE" in
         i?86|x86_64) :;;