summaryrefslogtreecommitdiff
path: root/tools/ds-identify
diff options
context:
space:
mode:
authorMark T. Voelker <mvoelker@vmware.com>2019-06-03 15:37:42 +0000
committerServer Team CI Bot <josh.powers+server-team-bot@canonical.com>2019-06-03 15:37:42 +0000
commitdeaeb714a3582ff7f31e411bcdaf9669903e35f0 (patch)
tree0c10194b3055cf188e0f2c680090cf52ce569b59 /tools/ds-identify
parentc3cd42cc655035209329b78b09b3cfb8fc01cf7d (diff)
downloadvyos-cloud-init-deaeb714a3582ff7f31e411bcdaf9669903e35f0.tar.gz
vyos-cloud-init-deaeb714a3582ff7f31e411bcdaf9669903e35f0.zip
Allow identification of OpenStack by Asset Tag
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
Diffstat (limited to 'tools/ds-identify')
-rwxr-xr-xtools/ds-identify8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/ds-identify b/tools/ds-identify
index 6518901e..e16708f6 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 "$nova"; then
+ return ${DS_FOUND}
+ fi
+ if dmi_chassis_asset_tag_matches "$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) :;;