(PA-6277) change manifests for amazon 2 repo

puppetlabs · Jun 10, 2024 · 5c3ffe8 · 5c3ffe8
1 parent c4999d4
commit 5c3ffe8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/manifests/osfamily/redhat.pp b/manifests/osfamily/redhat.pp
@@ -20,7 +20,6 @@
       'Amazon': {
         $major_version = $facts['os']['release']['major']
         $amz_el_version = "${major_version}" ? {
-          '2'              => '7',
           /^(2017|2018)$/  => '6',
           default          => $major_version,
         }

diff --git a/spec/classes/puppet_agent_osfamily_redhat_spec.rb b/spec/classes/puppet_agent_osfamily_redhat_spec.rb
@@ -21,7 +21,7 @@
     }
   end
 
-  [['Rocky', 'el/8', 8], ['AlmaLinux', 'el/8', 8], ['Fedora', 'fedora/f36', 36], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/6', 2018], ['Amazon', 'el/7', 2], ['Amazon', 'amazon/2023', 2023]].each do |os, urlbit, osmajor|
+  [['Rocky', 'el/8', 8], ['AlmaLinux', 'el/8', 8], ['Fedora', 'fedora/f36', 36], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/6', 2018], ['Amazon', 'amazon/2', 2], ['Amazon', 'amazon/2023', 2023]].each do |os, urlbit, osmajor|
     context "with #{os} and #{urlbit}" do
       let(:facts) do
         override_facts(super(), os: { name: os, release: { major: osmajor, }, })