diff options
| author | Scott Moser <smoser@brickies.net> | 2017-09-05 16:57:10 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-09-07 13:34:12 -0400 |
| commit | dcbb901cc3e9e888bc8f87e87bdc0ca8436a2baa (patch) | |
| tree | e4c104cd6ef815461d277001193036940a4a8090 /tools/ds-identify | |
| parent | 5582e4a266118b63ff86b6258b23d66df6d129d5 (diff) | |
| download | vyos-cloud-init-dcbb901cc3e9e888bc8f87e87bdc0ca8436a2baa.tar.gz vyos-cloud-init-dcbb901cc3e9e888bc8f87e87bdc0ca8436a2baa.zip | |
ds-identify: Make OpenStack return maybe on arch other than intel.
OpenStack Nova identifies itself only to Intel guests.
Make ds-identify return 'MAYBE' for OpenStack on non-intel arches.
An unnecessary change here is to rename the 'policy_nodmi' kwarg
to 'policy_no_dmi' in the related unit tests.
LP: #1715241
Diffstat (limited to 'tools/ds-identify')
| -rwxr-xr-x | tools/ds-identify | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/ds-identify b/tools/ds-identify index 33bd2991..ee5e05a4 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -833,6 +833,12 @@ dscheck_OpenStack() { return ${DS_FOUND} fi + # LP: #1715241 : arch other than intel are not identified properly. + case "$DI_UNAME_MACHINE" in + i?86|x86_64) :;; + *) return ${DS_MAYBE};; + esac + return ${DS_NOT_FOUND} } |