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/04/12 05:05:34 UTC
[bigtop] branch master updated: BIGTOP-3663. Hadoop deployment fails on Fedora 35. (#883)
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 df400a3c BIGTOP-3663. Hadoop deployment fails on Fedora 35. (#883)
df400a3c is described below
commit df400a3cd6b665d178dbe2977f5d0d675baa59d7
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Tue Apr 12 14:05:29 2022 +0900
BIGTOP-3663. Hadoop deployment fails on Fedora 35. (#883)
---
bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 5 +++++
provisioner/docker/docker-hadoop.sh | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
index c9bf160e..0c1f0eca 100644
--- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
+++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
@@ -208,6 +208,11 @@ BuildRequires: pkgconfig, libfuse-devel, libfuse2 , libopenssl-devel, gcc-c++, l
Requires: chkconfig, xinetd-simple-services, zlib, initscripts
%endif
+# Fedora 35: we need initscripts for /etc/init.d/functions and
+# initscripts-service for /sbin/service.
+%if %{?fc35}0
+Requires: initscripts, initscripts-service
+%endif
%description
Hadoop is a software platform that lets one easily write and
diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh
index fd096667..d172fe94 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -239,7 +239,7 @@ bigtop-puppet() {
future="--parser future"
fi
# BIGTOP-3401 Modify Puppet modulepath for puppetlabs-4.12
- docker exec $1 bash -c "puppet apply --detailed-exitcodes $future --hiera_config=/etc/puppet/hiera.yaml --modulepath=/bigtop-home/bigtop-deploy/puppet/modules:/etc/puppet/modules:/usr/share/puppet/modules:/etc/puppetlabs/code/modules /bigtop-home/bigtop-deploy/puppet/manifests"
+ docker exec $1 bash -c "puppet apply --detailed-exitcodes $future --hiera_config=/etc/puppet/hiera.yaml --modulepath=/bigtop-home/bigtop-deploy/puppet/modules:/etc/puppet/modules:/usr/share/puppet/modules:/etc/puppetlabs/code/modules:/etc/puppet/code/modules /bigtop-home/bigtop-deploy/puppet/manifests"
}
get-yaml-config() {