diff options
| author | Scott Moser <smoser@brickies.net> | 2017-03-27 14:19:17 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-03-28 11:12:15 -0400 |
| commit | dab9d6e0e92c7c933d86a0f696504fad2cebbda7 (patch) | |
| tree | 99013bd7c301b52b7d0aad47a7601ec11e67ec7d /tools | |
| parent | 328fe5ab399b1f5b48d1985f41fc2ef66e368922 (diff) | |
| download | vyos-cloud-init-dab9d6e0e92c7c933d86a0f696504fad2cebbda7.tar.gz vyos-cloud-init-dab9d6e0e92c7c933d86a0f696504fad2cebbda7.zip | |
OpenStack: identify OpenStack by product 'OpenStack Compute'.
OpenStack clouds installed with RedHat RDO have the nova product
configured in /etc/nova/release to be 'OpenStack Compute' rather than
upstream nova default of 'OpenStack Nova'.
This was first reported on Finnish provider Nebula (http://nebula.fi).
LP: #1675349
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ds-identify | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/ds-identify b/tools/ds-identify index 15d6600e..30106347 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -795,10 +795,15 @@ dscheck_OpenStack() { if [ $? -eq ${DS_FOUND} ]; then return ${DS_NOT_FOUND} fi - if dmi_product_name_is "OpenStack Nova"; then + local nova="OpenStack Nova" compute="OpenStack Compute" + if dmi_product_name_is "$nova"; then return ${DS_FOUND} fi - if [ "${DI_PID_1_PLATFORM}" = "OpenStack Nova" ]; then + if dmi_product_name_is "$compute"; then + # RDO installed nova (LP: #1675349). + return ${DS_FOUND} + fi + if [ "${DI_PID_1_PLATFORM}" = "$nova" ]; then return ${DS_FOUND} fi |