Merge pull request #476 from mihaibuzgau/master

(MODULES-10110) Handle Amazon Linux 2 as el-7
puppetlabs · Mar 20, 2020 · 9361e94 · 9361e94
2 parents 444ca84 + 1dd4eb0
commit 9361e94
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/manifests/osfamily/redhat.pp b/manifests/osfamily/redhat.pp
@@ -16,17 +16,22 @@
         $platform_and_version = "fedora/${::operatingsystemmajrelease}"
       }
       'Amazon': {
-        $platform_and_version = 'el/6'
+        if ("${::operatingsystemmajrelease}" == '2') {
+          $amz_el_version = '7'
+        } else {
+          $amz_el_version = '6'
+        }
+        $platform_and_version = "el/${amz_el_version}"
       }
       default: {
         $platform_and_version = "el/${::operatingsystemmajrelease}"
       }
     }
     if ($::puppet_agent::is_pe and (!$::puppet_agent::use_alternate_sources)) {
       $pe_server_version = pe_build_version()
-      # Treat Amazon Linux just like Enterprise Linux 6
+      # Treat Amazon Linux just like Enterprise Linux
       $pe_repo_dir = ($::operatingsystem == 'Amazon') ? {
-        true    => "el-6-${::architecture}",
+        true    => "el-${amz_el_version}-${::architecture}",
         default =>  $::platform_tag,
       }
       if $::puppet_agent::source {

diff --git a/spec/classes/puppet_agent_osfamily_redhat_spec.rb b/spec/classes/puppet_agent_osfamily_redhat_spec.rb
@@ -18,7 +18,7 @@
     }
   end
 
-  [['Fedora', 'fedora/f31', 31], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 6]].each do |os, urlbit, osmajor|
+  [['Fedora', 'fedora/f31', 31], ['CentOS', 'el/7', 7], ['Amazon', 'el/6', 2017], ['Amazon', 'el/7', 2]].each do |os, urlbit, osmajor|
     context "with #{os} and #{urlbit}" do
       let(:facts) do
         super().merge(:operatingsystem  => os, :operatingsystemmajrelease => osmajor)