Skip to content

Commit

Permalink
Merge pull request #692 from span786/PE-37297-4-add-amazon-linux-2023…
Browse files Browse the repository at this point in the history
…-to-puppet-agent-module-puppet-acceptance

[PE-37297]: Added support for amazon 2023 in redhat.pp manifest file
  • Loading branch information
joshcooper authored Jan 9, 2024
2 parents a3c356e + d5ad156 commit f1853b4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion acceptance/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || 'https://gith
gem "beaker-docker", *location_for(ENV['BEAKER_DOCKER_VERSION'] || '~> 0')
gem "beaker-vagrant", *location_for(ENV['BEAKER_VAGRANT_VERSION'] || '~> 0')
gem "beaker-vmpooler", *location_for(ENV['BEAKER_VMPOOLER_VERSION'] || '~> 1')
gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 1')
gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 2')
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0')
15 changes: 10 additions & 5 deletions manifests/osfamily/redhat.pp
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,17 @@
$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']
$amz_el_version = "${major_version}" ? {
'2' => '7',
/^(2017|2018)$/ => '6',
default => $major_version,
}

$platform_and_version = "${amz_el_version}" ? {
/^(6|7)$/ => "el/${amz_el_version}",
default => "amazon/${amz_el_version}",
}
$platform_and_version = "el/${amz_el_version}"
}
default: {
$platform_and_version = "el/${facts['os']['release']['major']}"
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/puppet_agent_osfamily_redhat_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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/7', 2]].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', 'el/7', 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, }, })
Expand Down

0 comments on commit f1853b4

Please sign in to comment.