[PE-37297]: Optimized Amazon linux 2023 support code

puppetlabs · Dec 26, 2023 · d7fd990 · d7fd990
1 parent b94cfb4
commit d7fd990
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/manifests/osfamily/redhat.pp b/manifests/osfamily/redhat.pp
@@ -19,18 +19,15 @@
       }
       'Amazon': {
         $major_version = $facts['os']['release']['major']
-        if ("${major_version}" == '2') {
-          $amz_el_version = '7'
-        }
-        else {
-          $amz_el_version = '6'
+        $amz_el_version = "${major_version}" ? {
+          '2'     => '7',
+          '2017'  => '6',
+          default => $major_version,
         }
 
-        if ("${amz_el_version}" =~ /^(\A6\z|\A7\z)/) {
-          $platform_and_version = "el/${amz_el_version}"
-        }
-        else {
-          $platform_and_version = "amazon/${major_version}"
+        $platform_and_version = "${amz_el_version}" ? {
+          /^(6|7)$/  => "el/${amz_el_version}",
+          default    => "amazon/${amz_el_version}",
         }
       }
       default: {