check for Amazon Linux version 2

voxpupuli · Jan 16, 2020 · 538acd2 · 538acd2
1 parent 810e597
commit 538acd2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -8,7 +8,7 @@
   #   the most specific declaration of proxy.
   $proxy = 'absent'
 
-  if "${::operatingsystem}" == 'Amazon' {
+  if "${::operatingsystem}" == 'Amazon' and "${::operatingsystemmajrelease}" == '2'  {
     # Amazon Linux 2 is equivalent of Enterprise Linux 7 so we use that version for epel
     # https://aws.amazon.com/premiumsupport/knowledge-center/ec2-enable-epel/
     $os_maj_release = '7'

diff --git a/spec/classes/epel_spec.rb b/spec/classes/epel_spec.rb
@@ -202,8 +202,9 @@
   context 'operatingsystem => Amazon' do
     let :facts do
       default_facts.merge(
-        operatingsystem:        'Amazon',
-        operatingsystemrelease: 'Amazon'
+        operatingsystem:            'Amazon',
+        operatingsystemrelease:     'Amazon',
+        operatingsystemmajrelease:  '2'
       )
     end