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 c2b7898a3 BIGTOP-4102. Fix failure of toolchain manifest on Fedora 38
due to unresolved facter variable (#1266)
c2b7898a3 is described below
commit c2b7898a313407da15e5bbe90b50dc50a2572df9
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Sat May 11 19:12:17 2024 +0900
BIGTOP-4102. Fix failure of toolchain manifest on Fedora 38 due to
unresolved facter variable (#1266)
* BIGTOP-4102. Fix failure of toolchain manifest on Fedora 38 due to
unresolved facter variable.
* avoid expecting class variable is visible outside. switching ha and
non-ha should be done by explicit settings in the site.yaml.
(cherry picked from commit 50e616ad89fbf6db3c0516ef269eaf4e2a668249)
---
bigtop-deploy/puppet/hiera.yaml | 1 -
bigtop-deploy/puppet/hieradata/bigtop/ha.yaml | 7 -------
bigtop-deploy/puppet/hieradata/bigtop/noha.yaml | 2 --
bigtop-deploy/puppet/hieradata/site.yaml | 6 ++++++
bigtop-deploy/puppet/manifests/cluster.pp | 7 -------
bigtop_toolchain/bin/puppetize.sh | 1 +
6 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/bigtop-deploy/puppet/hiera.yaml b/bigtop-deploy/puppet/hiera.yaml
index 848c55037..a4e2ec83a 100644
--- a/bigtop-deploy/puppet/hiera.yaml
+++ b/bigtop-deploy/puppet/hiera.yaml
@@ -3,6 +3,5 @@
:datadir: /etc/puppet/hieradata
:hierarchy:
- site
- - "bigtop/%{hadoop_hiera_ha_path}"
- bigtop/cluster
- bigtop/repo
diff --git a/bigtop-deploy/puppet/hieradata/bigtop/ha.yaml
b/bigtop-deploy/puppet/hieradata/bigtop/ha.yaml
deleted file mode 100644
index 365498750..000000000
--- a/bigtop-deploy/puppet/hieradata/bigtop/ha.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-hadoop::common_hdfs::ha: "manual"
-hadoop::common_hdfs::hadoop_namenode_host:
- - "%{hiera('bigtop::hadoop_head_node')}"
- - "%{hiera('bigtop::standby_head_node')}"
-hadoop::common_hdfs::hadoop_ha_nameservice_id: "ha-nn-uri"
-hadoop_cluster_node::hadoop_namenode_uri:
"hdfs://%{hiera('hadoop_ha_nameservice_id')}:8020"
diff --git a/bigtop-deploy/puppet/hieradata/bigtop/noha.yaml
b/bigtop-deploy/puppet/hieradata/bigtop/noha.yaml
deleted file mode 100644
index ac81412b3..000000000
--- a/bigtop-deploy/puppet/hieradata/bigtop/noha.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# all done via defaults
diff --git a/bigtop-deploy/puppet/hieradata/site.yaml
b/bigtop-deploy/puppet/hieradata/site.yaml
index fce6ad9ea..72df5a301 100644
--- a/bigtop-deploy/puppet/hieradata/site.yaml
+++ b/bigtop-deploy/puppet/hieradata/site.yaml
@@ -11,6 +11,12 @@ hadoop::hadoop_storage_dirs:
- /data/3
- /data/4
+#hadoop::common_hdfs::ha: "auto"
+#hadoop::common_hdfs::hadoop_namenode_host:
+# - "%{hiera('bigtop::hadoop_head_node')}"
+# - "%{hiera('bigtop::standby_head_node')}"
+#hadoop_cluster_node::hadoop_namenode_uri: "hdfs://ha-nn-uri:8020"
+
#hadoop_cluster_node::cluster_components:
# - alluxio
# - flink
diff --git a/bigtop-deploy/puppet/manifests/cluster.pp
b/bigtop-deploy/puppet/manifests/cluster.pp
index ec81ada94..51840cf4b 100644
--- a/bigtop-deploy/puppet/manifests/cluster.pp
+++ b/bigtop-deploy/puppet/manifests/cluster.pp
@@ -154,13 +154,6 @@ class hadoop_cluster_node (
"" => false,
default => true,
}
-
- # look into alternate hiera datasources configured using this path in
- # hiera.yaml
- $hadoop_hiera_ha_path = $ha_enabled ? {
- false => "noha",
- true => "ha",
- }
}
class node_with_roles ($roles = hiera("bigtop::roles")) inherits
hadoop_cluster_node {
diff --git a/bigtop_toolchain/bin/puppetize.sh
b/bigtop_toolchain/bin/puppetize.sh
index 1fa3255b5..3167e4549 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -29,6 +29,7 @@ case ${ID}-${VERSION_ID} in
# 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.
puppet module install puppetlabs-stdlib --version 4.12.0
+ echo 'include_legacy_facts=true' >> /etc/puppet/puppet.conf
;;
ubuntu-18.04|ubuntu-22.04)
apt-get update
