From 14d936afb658b1c74b5ca6f26342777386fc8c15 Mon Sep 17 00:00:00 2001
From: Nicolas Bock <nicolas.bock@canonical.com>
Date: Mon, 4 Dec 2023 11:05:26 -0700
Subject: [PATCH] Compare OS release correctly

OS releases need to be compared using the `os_releases` associative
array. This change fixes the incorrect comparison for mapping to the
appropriate Ceph release.

Fixes: https://github.com/canonical/stsstack-bundles/issues/162
Signed-off-by: Nicolas Bock <nicolas.bock@canonical.com>
---
 common/helpers | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/common/helpers b/common/helpers
index bcda439b..c9cb7fcb 100644
--- a/common/helpers
+++ b/common/helpers
@@ -618,19 +618,18 @@ ost_release_autocorrect ()
 # Requires APP_RELEASE_NAMES set by module generate-bundle.sh
 get_app_release_name ()
 {
-    local ubuntu_release="$1"
+    local ubuntu_release=$1
     local release_name=
 
     [ -n "$ubuntu_release" ] || return 0
-    readarray -t names_sorted_asc<<<"`echo ${!APP_RELEASE_NAMES[@]}| \
-                                            tr ' ' '\n'| sort`"
-    for name in ${names_sorted_asc[@]}; do
-        rel=${APP_RELEASE_NAMES[$name]}
-        if ! [[ "$rel" > "$ubuntu_release" ]]; then
-            release_name=$name
+    readarray -t names_sorted_asc<<<"$(echo ${!APP_RELEASE_NAMES[@]}| tr ' ' '\n'| sort)"
+    for name in "${names_sorted_asc[@]}"; do
+        rel=${APP_RELEASE_NAMES[${name}]}
+        if (( ${os_releases[${rel}]} <= ${os_releases[${ubuntu_release}]} )); then
+            release_name=${name}
         fi
     done
-    echo $release_name
+    echo "${release_name}"
     return 0
 }
 
@@ -839,4 +838,3 @@ is_hyperconverged ()
         return 1
     fi
 }
-