[bigtop] branch master updated: BIGTOP-3418. Fix Ambari deployment on CentOS 8, Fedora 31 and Debian 10. (#683)

[iw...@apache.org]

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 fd64a15  BIGTOP-3418. Fix Ambari deployment on CentOS 8, Fedora 31 and Debian 10. (#683)
fd64a15 is described below

commit fd64a15b95d48b699cbe5b586ba365a226748565
Author: Kengo Seki <se...@apache.org>
AuthorDate: Tue Sep 29 20:45:11 2020 +0900

    BIGTOP-3418. Fix Ambari deployment on CentOS 8, Fedora 31 and Debian 10. (#683)
---
 bigtop-deploy/puppet/modules/ambari/manifests/init.pp | 2 +-
 bigtop_toolchain/bin/puppetize.sh                     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bigtop-deploy/puppet/modules/ambari/manifests/init.pp b/bigtop-deploy/puppet/modules/ambari/manifests/init.pp
index 4d294df..a8f2219 100644
--- a/bigtop-deploy/puppet/modules/ambari/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/ambari/manifests/init.pp
@@ -35,7 +35,7 @@ class ambari {
 
     exec {
         "server setup":
-           command => "/usr/sbin/ambari-server setup -j $(readlink -f /usr/bin/java | sed 's@jre/bin/java@@') -s",
+           command => "/usr/sbin/ambari-server setup -j $(readlink -f /usr/bin/java | sed -e 's@jre/bin/java@@' -e 's@bin/java@@') -s",
            require => [ Package["ambari-server"], Package["jdk"], Exec["mpack install"] ]
     }
 
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index b2e8976..c07aa4c 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -24,7 +24,7 @@ case ${ID}-${VERSION_ID} in
     fedora-31)
         dnf -y install yum-utils
         dnf -y check-update
-        dnf -y install hostname findutils curl sudo unzip wget puppet procps-ng libxcrypt-compat
+        dnf -y install hostname diffutils findutils curl sudo unzip wget puppet procps-ng libxcrypt-compat
         # On Fedora 31, the puppetlabs-stdlib package provided by the distro installs the module
         # into /usr/share/puppet/modules, but it's not recognized as the default module path.
         # So we install that module in the same way as CentOS 7.
@@ -58,7 +58,7 @@ case ${ID}-${VERSION_ID} in
     centos-8*)
         rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
         dnf -y check-update
-        dnf -y install hostname curl sudo unzip wget puppet 'dnf-command(config-manager)'
+        dnf -y install hostname diffutils curl sudo unzip wget puppet 'dnf-command(config-manager)'
         # Install the module in the same way as Fedora 31 and CentOS 7 for compatibility issues.
         puppet module install puppetlabs-stdlib --version 4.12.0
         # Enabling the PowerTools and EPEL repositories via Puppet doesn't seem to work in some cases.
@@ -68,7 +68,7 @@ case ${ID}-${VERSION_ID} in
     rhel-8*)
         rpm -Uvh https://yum.puppet.com/puppet5-release-el-8.noarch.rpm
         dnf -y check-update
-        dnf -y install hostname curl sudo unzip wget puppet-agent 'dnf-command(config-manager)'
+        dnf -y install hostname diffutils curl sudo unzip wget puppet-agent 'dnf-command(config-manager)'
         puppet module install puppetlabs-stdlib
         # Enabling the CodeReady repositories via Puppet doesn't seem to work in some cases.
         # As a workaround for that, enable the former here in advance of running the Puppet manifests.