This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 5b5724b0a BIGTOP-4109: Fix deployment failure of Spark on Fedora 38
due to manifest incompatible with Puppet 8 (#1278)
5b5724b0a is described below
commit 5b5724b0a14406eb235afc85f65b77f46d147823
Author: Shuhei Yamasaki <[email protected]>
AuthorDate: Sun Jun 9 20:38:53 2024 +0900
BIGTOP-4109: Fix deployment failure of Spark on Fedora 38 due to manifest
incompatible with Puppet 8 (#1278)
(cherry picked from commit f7174137174e15e9d91a09740819b813d8cbfeb7)
---
bigtop-deploy/puppet/modules/spark/templates/spark-defaults.conf | 4 ++--
bigtop-deploy/puppet/modules/spark/templates/spark-env.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bigtop-deploy/puppet/modules/spark/templates/spark-defaults.conf
b/bigtop-deploy/puppet/modules/spark/templates/spark-defaults.conf
index 144162e3f..8029daa16 100644
--- a/bigtop-deploy/puppet/modules/spark/templates/spark-defaults.conf
+++ b/bigtop-deploy/puppet/modules/spark/templates/spark-defaults.conf
@@ -16,7 +16,7 @@
<% if @master_url -%>
spark.master <%= @master_url %>
<% else -%>
-<% if (scope['spark::deploy::roles'] & ['spark-master', 'spark-worker']) != []
-%>
+<% if (@roles & ['spark-master', 'spark-worker']) != [] -%>
spark.master spark://<%= @master_host %>:<%= @master_port %>
<% else -%>
spark.master yarn
@@ -49,4 +49,4 @@ spark.hadoop.javax.jdo.option.ConnectionURL <%=
@spark_hadoop_javax_jdo_option_C
<% if @spark_hadoop_javax_jdo_option_ConnectionDriverName -%>
spark.hadoop.javax.jdo.option.ConnectionDriverName <%=
@spark_hadoop_javax_jdo_option_ConnectionDriverName %>
<% end -%>
-<% end -%>
\ No newline at end of file
+<% end -%>
diff --git a/bigtop-deploy/puppet/modules/spark/templates/spark-env.sh
b/bigtop-deploy/puppet/modules/spark/templates/spark-env.sh
index c10414179..f919c121c 100755
--- a/bigtop-deploy/puppet/modules/spark/templates/spark-env.sh
+++ b/bigtop-deploy/puppet/modules/spark/templates/spark-env.sh
@@ -27,7 +27,7 @@ export SPARK_MASTER_IP=$STANDALONE_SPARK_MASTER_HOST
<% if @master_url -%>
export SPARK_MASTER_URL=<%= @master_url %>
<% else -%>
-<% if (scope['spark::deploy::roles'] & ['spark-master', 'spark-worker']) != []
-%>
+<% if (@roles & ['spark-master', 'spark-worker']) != [] -%>
export SPARK_MASTER_URL=spark://<%= @master_host %>:<%= @master_port %>
<% else -%>
export SPARK_MASTER_URL=yarn
