This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new c526b011 BIGTOP-3951. Fix toolchain to work with the recent version of
facter. (#1122)
c526b011 is described below
commit c526b01147578b580feeb296116123db90c08bce
Author: Kengo Seki <[email protected]>
AuthorDate: Mon Jun 26 16:42:13 2023 +0900
BIGTOP-3951. Fix toolchain to work with the recent version of facter.
(#1122)
---
bigtop-deploy/puppet/manifests/bigtop_repo.pp | 2 +-
bigtop-deploy/puppet/manifests/jdk.pp | 2 +-
bigtop-deploy/puppet/modules/hadoop/manifests/init.pp | 8 ++++----
bigtop_toolchain/manifests/cleanup.pp | 2 +-
bigtop_toolchain/manifests/env.pp | 2 +-
bigtop_toolchain/manifests/gnupg.pp | 2 +-
bigtop_toolchain/manifests/installer.pp | 2 +-
bigtop_toolchain/manifests/jdk.pp | 2 +-
bigtop_toolchain/manifests/jdk11.pp | 2 +-
bigtop_toolchain/manifests/packages.pp | 2 +-
bigtop_toolchain/manifests/renv.pp | 2 +-
11 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/bigtop-deploy/puppet/manifests/bigtop_repo.pp
b/bigtop-deploy/puppet/manifests/bigtop_repo.pp
index 1aa767f6..46d197fc 100644
--- a/bigtop-deploy/puppet/manifests/bigtop_repo.pp
+++ b/bigtop-deploy/puppet/manifests/bigtop_repo.pp
@@ -20,7 +20,7 @@ class bigtop_repo {
$default_repo =
"http://repos.bigtop.apache.org/releases/${bigtop_repo_default_version}/${lower_os}/${operatingsystemmajrelease}/${architecture}";
case $::operatingsystem {
- /(OracleLinux|Amazon|CentOS|Fedora|RedHat)/: {
+ /(OracleLinux|Amazon|CentOS|Fedora|RedHat|Rocky)/: {
$baseurls_array = any2array(hiera("bigtop::bigtop_repo_uri",
$default_repo))
each($baseurls_array) |$count, $baseurl| {
notify { "Baseurl: $baseurl": }
diff --git a/bigtop-deploy/puppet/manifests/jdk.pp
b/bigtop-deploy/puppet/manifests/jdk.pp
index 895a81f5..36800eb0 100644
--- a/bigtop-deploy/puppet/manifests/jdk.pp
+++ b/bigtop-deploy/puppet/manifests/jdk.pp
@@ -41,7 +41,7 @@ class jdk {
noop => $jdk_preinstalled,
}
}
- /(CentOS|Amazon|Fedora|RedHat)/: {
+ /(CentOS|Amazon|Fedora|RedHat|Rocky)/: {
package { 'jdk':
name => 'java-1.8.0-openjdk-devel',
ensure => present,
diff --git a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
index c7a16131..f9fd2e9b 100644
--- a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
@@ -998,10 +998,10 @@ class hadoop ($hadoop_security_authentication = "simple",
include hadoop::common_yarn
$hadoop_client_packages = $operatingsystem ? {
- /(OracleLinux|CentOS|RedHat|Fedora)/ => [ "hadoop-doc",
"hadoop-hdfs-fuse", "hadoop-client", "hadoop-libhdfs", "hadoop-debuginfo" ],
- /(SLES|OpenSuSE)/ => [ "hadoop-doc",
"hadoop-hdfs-fuse", "hadoop-client", "hadoop-libhdfs" ],
- /(Ubuntu|Debian)/ => [ "hadoop-doc",
"hadoop-hdfs-fuse", "hadoop-client", "libhdfs0-dev" ],
- default => [ "hadoop-doc",
"hadoop-hdfs-fuse", "hadoop-client" ],
+ /(OracleLinux|CentOS|RedHat|Fedora|Rocky)/ => [ "hadoop-doc",
"hadoop-hdfs-fuse", "hadoop-client", "hadoop-libhdfs", "hadoop-debuginfo" ],
+ /(SLES|OpenSuSE)/ => [ "hadoop-doc",
"hadoop-hdfs-fuse", "hadoop-client", "hadoop-libhdfs" ],
+ /(Ubuntu|Debian)/ => [ "hadoop-doc",
"hadoop-hdfs-fuse", "hadoop-client", "libhdfs0-dev" ],
+ default => [ "hadoop-doc",
"hadoop-hdfs-fuse", "hadoop-client" ],
}
package { $hadoop_client_packages:
diff --git a/bigtop_toolchain/manifests/cleanup.pp
b/bigtop_toolchain/manifests/cleanup.pp
index edf20a08..6977dc4d 100644
--- a/bigtop_toolchain/manifests/cleanup.pp
+++ b/bigtop_toolchain/manifests/cleanup.pp
@@ -15,7 +15,7 @@
class bigtop_toolchain::cleanup {
$packager_cleanup = $operatingsystem ? {
- /(?i:(centos|fedora|redhat|amazon))/ => 'yum clean all',
+ /(?i:(centos|fedora|redhat|amazon|rocky))/ => 'yum clean all',
/(?i:(SLES|opensuse))/ => 'zypper clean -a',
/Ubuntu|Debian/ => 'apt-get clean',
}
diff --git a/bigtop_toolchain/manifests/env.pp
b/bigtop_toolchain/manifests/env.pp
index d8ac0516..db7865ad 100644
--- a/bigtop_toolchain/manifests/env.pp
+++ b/bigtop_toolchain/manifests/env.pp
@@ -35,7 +35,7 @@ class bigtop_toolchain::env {
'Ubuntu': {
$javahome = "/usr/lib/jvm/${java}-openjdk-$arch"
}
- 'Fedora','Centos','RedHat','Amazon': {
+ 'Fedora','Centos','RedHat','Amazon','Rocky': {
$javahome = "/usr/lib/jvm/${java}"
}
'OpenSuSE' : {
diff --git a/bigtop_toolchain/manifests/gnupg.pp
b/bigtop_toolchain/manifests/gnupg.pp
index 88573701..2ff5427f 100644
--- a/bigtop_toolchain/manifests/gnupg.pp
+++ b/bigtop_toolchain/manifests/gnupg.pp
@@ -16,7 +16,7 @@
class bigtop_toolchain::gnupg {
case $operatingsystem {
- /(?i:(centos|fedora|redhat))/: {
+ /(?i:(centos|fedora|redhat|rocky))/: {
$pkg = "gnupg2"
$cmd = "gpg2"
}
diff --git a/bigtop_toolchain/manifests/installer.pp
b/bigtop_toolchain/manifests/installer.pp
index 0cde02f4..5c037ab8 100644
--- a/bigtop_toolchain/manifests/installer.pp
+++ b/bigtop_toolchain/manifests/installer.pp
@@ -42,7 +42,7 @@ class bigtop_toolchain::installer {
require => Class['bigtop_toolchain::jdk'],
}
}
- /(CentOS|Fedora|RedHat)/: {
+ /(CentOS|Fedora|RedHat|Rocky)/: {
exec { 'ensure java 8 is set as default':
command => "update-alternatives --set java java-1.8.0-openjdk.$(uname
-m) \
&& update-alternatives --set javac
java-1.8.0-openjdk.$(uname -m)",
diff --git a/bigtop_toolchain/manifests/jdk.pp
b/bigtop_toolchain/manifests/jdk.pp
index c35ae242..d40cfc68 100644
--- a/bigtop_toolchain/manifests/jdk.pp
+++ b/bigtop_toolchain/manifests/jdk.pp
@@ -39,7 +39,7 @@ class bigtop_toolchain::jdk {
ensure => present,
}
}
- /(CentOS|Amazon|Fedora|RedHat)/: {
+ /(CentOS|Amazon|Fedora|RedHat|Rocky)/: {
package { 'java-1.8.0-openjdk-devel' :
ensure => present
}
diff --git a/bigtop_toolchain/manifests/jdk11.pp
b/bigtop_toolchain/manifests/jdk11.pp
index 2e974cb1..afd53760 100644
--- a/bigtop_toolchain/manifests/jdk11.pp
+++ b/bigtop_toolchain/manifests/jdk11.pp
@@ -22,7 +22,7 @@ class bigtop_toolchain::jdk11 {
ensure => present,
}
}
- /(CentOS|Fedora|RedHat)/: {
+ /(CentOS|Fedora|RedHat|Rocky)/: {
package { 'java-11-openjdk-devel' :
ensure => present
}
diff --git a/bigtop_toolchain/manifests/packages.pp
b/bigtop_toolchain/manifests/packages.pp
index eeb77f9a..7c558ee2 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -15,7 +15,7 @@
class bigtop_toolchain::packages {
case $operatingsystem{
- /(?i:(centos|fedora|redhat))/: {
+ /(?i:(centos|fedora|redhat|rocky))/: {
$_pkgs = [
"unzip",
"rsync",
diff --git a/bigtop_toolchain/manifests/renv.pp
b/bigtop_toolchain/manifests/renv.pp
index 07ca8158..9ac3138f 100644
--- a/bigtop_toolchain/manifests/renv.pp
+++ b/bigtop_toolchain/manifests/renv.pp
@@ -18,7 +18,7 @@ class bigtop_toolchain::renv {
require bigtop_toolchain::packages
case $operatingsystem{
- /(?i:(centos|fedora|redhat|Amazon))/: {
+ /(?i:(centos|fedora|redhat|amazon|rocky))/: {
$pkgs = [
"R",
"R-devel",
