cloud-init-dev team mailing list archive

[Scott Moser <smoser@xxxxxxxxxx>]

Scott Moser has proposed merging ~smoser/cloud-init:bug/1675349-openstack-finnish-nebula into cloud-init:master.

Commit message:
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

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1675349 in cloud-init: "Dsid missing source on Finnish provider Nebula "
  https://bugs.launchpad.net/cloud-init/+bug/1675349

For more details, see:
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/321104
-- 
Your team cloud init development team is requested to review the proposed merge of ~smoser/cloud-init:bug/1675349-openstack-finnish-nebula into cloud-init:master.

diff --git a/tools/ds-identify b/tools/ds-identify
index bf09a3a..89a4331 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -783,10 +783,15 @@ dscheck_OpenStack() {
     if [ $? -eq ${DS_FOUND} ]; then
         return ${DS_NOT_FOUND}
     fi
-    if dmi_product_name_is "OpenStack Nova"; then
+    local os_nova="OpenStack Nova" os_compute="OpenStack Compute"
+    if dmi_product_name_is "${os_nova}"; then
         return ${DS_FOUND}
     fi
-    if [ "${DI_PID_1_PLATFORM}" = "OpenStack Nova" ]; then
+    if dmi_product_name_is "${os_compute}"; then
+        # http://nebula.fi/ LP: #1675349
+        return ${DS_FOUND}
+    fi
+    if [ "${DI_PID_1_PLATFORM}" = "${os_nova}" ]; then
         return ${DS_FOUND}
     fi