Merge ~smoser/cloud-init:bug/1675349-openstack-finnish-nebula into cloud-init:master

[Scott Moser]

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

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:6487aaa51a2f9f77dcf5719598272c849c4ac983
https://jenkins.ubuntu.com/server/job/cloud-init-ci/164/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/164
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/164
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/164
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/164
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/164

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/164/rebuild

review: Approve (continuous-integration)

diff --git a/tools/ds-identify b/tools/ds-identify
index 15d6600..3010634 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