[PE-37297]: Added support for amazon 2023 in redhat.pp manifest file

puppetlabs · Dec 19, 2023 · 83d9680 · 83d9680
1 parent 1b436d8
commit 83d9680
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,5 @@
 .envrc
 /inventory.yaml
 /spec/fixtures/litmus_inventory.yaml
+/acceptance/junit
+/acceptance/log
diff --git a/manifests/osfamily/redhat.pp b/manifests/osfamily/redhat.pp
@@ -18,12 +18,20 @@
         $platform_and_version = "fedora/${facts['os']['release']['major']}"
       }
       'Amazon': {
-        if ("${facts['os']['release']['major']}" == '2') {
+        $major_version = $facts['os']['release']['major']
+        if ("${major_version}" == '2') {
           $amz_el_version = '7'
-        } else {
+        }
+        else {
           $amz_el_version = '6'
         }
-        $platform_and_version = "el/${amz_el_version}"
+
+        if ("${amz_el_version}" =~ /^(\A6\z|\A7\z)/) {
+          $platform_and_version = "el/${amz_el_version}"
+        }
+        else {
+          $platform_and_version = "amazon/${major_version}"
+        }
       }
       default: {
         $platform_and_version = "el/${facts['os']['release']['major']}"