From dab9d6e0e92c7c933d86a0f696504fad2cebbda7 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 27 Mar 2017 14:19:17 -0400 Subject: 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 --- tools/ds-identify | 9 +++++++-- 1 file 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 -- cgit v1.2.3