From 840e0409d2b743bfd045ca0e128c018d2c5f0e3f Mon Sep 17 00:00:00 2001 From: David Swan Date: Tue, 5 Oct 2021 16:24:08 +0100 Subject: [PATCH 1/4] (IAC-1752) - Add Support for AlmaLinux 8 --- metadata.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/metadata.json b/metadata.json index aee0d018..5dac8df2 100644 --- a/metadata.json +++ b/metadata.json @@ -76,6 +76,12 @@ "operatingsystemrelease": [ "8" ] + }, + { + "operatingsystem": "AlmaLinux", + "operatingsystemrelease": [ + "8" + ] } ], "requirements": [ From 0521794c65f046fa8dcb0feb2b74e1f38850b3d7 Mon Sep 17 00:00:00 2001 From: daianamezdrea <46529728+daianamezdrea@users.noreply.github.com> Date: Mon, 11 Oct 2021 15:26:52 +0300 Subject: [PATCH 2/4] Update params.pp --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 0b09028f..9dde10ba 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -9,7 +9,7 @@ case $facts['os']['family'] { 'RedHat': { case $facts['os']['name'] { - 'Rocky', 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': { + 'Alma', 'Rocky', 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': { if (versioncmp($facts['os']['release']['full'], '5.0') < 0) { $jdk_package = 'java-1.6.0-sun-devel' $jre_package = 'java-1.6.0-sun' From 7085297c4bcadef2a227e8657c92f3ab0d86263c Mon Sep 17 00:00:00 2001 From: daiana Date: Mon, 11 Oct 2021 15:38:08 +0300 Subject: [PATCH 3/4] Fix lint error --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 9dde10ba..637e31a5 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -9,7 +9,7 @@ case $facts['os']['family'] { 'RedHat': { case $facts['os']['name'] { - 'Alma', 'Rocky', 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': { + 'Alma', 'Rocky', 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': { if (versioncmp($facts['os']['release']['full'], '5.0') < 0) { $jdk_package = 'java-1.6.0-sun-devel' $jre_package = 'java-1.6.0-sun' From 97533d983721800d69f8db0b3f4d826542516724 Mon Sep 17 00:00:00 2001 From: daianamezdrea <46529728+daianamezdrea@users.noreply.github.com> Date: Mon, 11 Oct 2021 15:44:00 +0300 Subject: [PATCH 4/4] Update params.pp --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 637e31a5..54a990eb 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -9,7 +9,7 @@ case $facts['os']['family'] { 'RedHat': { case $facts['os']['name'] { - 'Alma', 'Rocky', 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': { + 'AlmaLinux', 'Rocky', 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': { if (versioncmp($facts['os']['release']['full'], '5.0') < 0) { $jdk_package = 'java-1.6.0-sun-devel' $jre_package = 'java-1.6.0-sun'