From e5007d46183328f2a57a5126d2a5f3b5f30d12f9 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Sat, 26 Sep 2020 15:15:42 -0700
Subject: [PATCH] Update opensuse version

Nova has newer qemu requirements which needs opensuse 15.2 to meet. The
infra opensuse 15 images are 15.2 now to accomodate that. Update
opensuse's supported version to match.

Change-Id: I6f3c5234920b185b2b0cd9c358371402f7a7b922
(cherry picked from commit 471f1625bb3ae9b11d9da69404f945a19d8b010a)
(cherry picked from commit 0ebe7b072e066ea34f69d2c532d39f579f0af8a5)
(cherry picked from commit 0f351d2a4d2725e4b43ef244277c7292a1f8698b)
---
 lib/lvm  | 14 ++++++++------
 stack.sh |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/lvm b/lib/lvm
index d9e78a016f..ba6d6e5d7e 100644
--- a/lib/lvm
+++ b/lib/lvm
@@ -124,13 +124,15 @@ function init_lvm_volume_group {
     local vg=$1
     local size=$2
 
-    # Start the lvmetad and tgtd services
-    if is_fedora || is_suse; then
-        # services is not started by default
+    # Start the lvmetad service
+    if is_fedora ; then
+        # service is not started by default
         start_service lvm2-lvmetad
-        if [ "$CINDER_ISCSI_HELPER" = "tgtadm" ]; then
-            start_service tgtd
-        fi
+    fi
+
+    # Start the tgtd service on Fedora and SUSE if tgtadm is used
+    if  is_fedora || is_suse  && [[ "$CINDER_ISCSI_HELPER" = "tgtadm" ]]; then
+        start_service tgtd
     fi
 
     # Start with a clean volume group
diff --git a/stack.sh b/stack.sh
index 93d254835d..8c851f1a25 100755
--- a/stack.sh
+++ b/stack.sh
@@ -221,7 +221,7 @@ write_devstack_version
 
 # Warn users who aren't on an explicitly supported distro, but allow them to
 # override check and attempt installation with ``FORCE=yes ./stack``
-if [[ ! ${DISTRO} =~ (xenial|artful|bionic|stretch|jessie|f28|f29|opensuse-15.0|opensuse-15.1|opensuse-tumbleweed|rhel7) ]]; then
+if [[ ! ${DISTRO} =~ (xenial|artful|bionic|stretch|jessie|f28|f29|opensuse-15.2|opensuse-tumbleweed|rhel7) ]]; then
     echo "WARNING: this script has not been tested on $DISTRO"
     if [[ "$FORCE" != "yes" ]]; then
         die $LINENO "If you wish to run this script anyway run with FORCE=yes"