You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by iw...@apache.org on 2022/02/05 10:58:36 UTC

[bigtop] branch master updated: BIGTOP-3637. Add Rocky Linux 8 support. (#859)

This is an automated email from the ASF dual-hosted git repository.

iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new e22bb11  BIGTOP-3637. Add Rocky Linux 8 support. (#859)
e22bb11 is described below

commit e22bb1114c64f99f65056485dd454bc78b4c9f13
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Sat Feb 5 19:58:31 2022 +0900

    BIGTOP-3637. Add Rocky Linux 8 support. (#859)
---
 bigtop-deploy/puppet/manifests/jdk.pp | 2 +-
 bigtop_toolchain/bin/puppetize.sh     | 2 +-
 docker/bigtop-slaves/build.sh         | 4 ++++
 provisioner/docker/docker-hadoop.sh   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bigtop-deploy/puppet/manifests/jdk.pp b/bigtop-deploy/puppet/manifests/jdk.pp
index 8813821..895a81f 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)/: {
+    /(CentOS|Amazon|Fedora|RedHat)/: {
       package { 'jdk':
         name => 'java-1.8.0-openjdk-devel',
         ensure => present,
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index 6f16084..26c48ca 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -47,7 +47,7 @@ case ${ID}-${VERSION_ID} in
         yum -y install hostname curl sudo unzip wget puppet
         puppet module install puppetlabs-stdlib --version 4.12.0
         ;;
-    centos-8*)
+    centos-8*|rocky-8*)
         rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
         dnf -y check-update
         dnf -y install glibc-langpack-en hostname diffutils curl sudo unzip wget puppet 'dnf-command(config-manager)'
diff --git a/docker/bigtop-slaves/build.sh b/docker/bigtop-slaves/build.sh
index b8f8cb4..e1ad239 100755
--- a/docker/bigtop-slaves/build.sh
+++ b/docker/bigtop-slaves/build.sh
@@ -68,6 +68,10 @@ case ${OS} in
             UPDATE_SOURCE="yum clean all \&\& yum updateinfo"
         fi
         ;;
+    rockylinux)
+        PUPPET_MODULES="/etc/puppetlabs/code/environments/production/modules/bigtop_toolchain"
+        UPDATE_SOURCE="dnf clean all \&\& dnf updateinfo"
+        ;;
     opensuse)
         PUPPET_MODULES="/etc/puppet/modules/bigtop_toolchain"
         UPDATE_SOURCE="zypper clean \&\& zypper refresh"
diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh
index 2a08243..fd09666 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -378,7 +378,7 @@ while [ $# -gt 0 ]; do
         image_name=$2
         # Determine distro to bootstrap provisioning environment
         case "${image_name}" in
-          *-centos-*|*-fedora-*|*-opensuse-*)
+          *-centos-*|*-fedora-*|*-opensuse-*|*-rockylinux-*)
             distro=centos
             ;;
           *-debian-*|*-ubuntu-*)