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

puppetlabs · Dec 19, 2023 · 076abee · 076abee
1 parent 1b436d8
commit 076abee
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 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,16 @@
         $platform_and_version = "fedora/${facts['os']['release']['major']}"
       }
       'Amazon': {
-        if ("${facts['os']['release']['major']}" == '2') {
-          $amz_el_version = '7'
-        } else {
-          $amz_el_version = '6'
+        $major_version = $facts['os']['release']['major']
+        if ($major_version == '2') {
+          $platform_and_version = 'el/7'
+        }
+        elsif ($major_version == '2017') {
+          $platform_and_version = 'el/6'
+        }
+        else {
+          $platform_and_version = "amazon/${major_version}"
         }
-        $platform_and_version = "el/${amz_el_version}"
       }
       default: {
         $platform_and_version = "el/${facts['os']['release']['major']}"