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 7c8255fca BIGTOP-4269. Add provisioner config for Debian 12 and Ubuntu
24.04. (#1305)
7c8255fca is described below
commit 7c8255fcab3fb625fa0e90082716ff60d7521a6c
Author: Kengo Seki <[email protected]>
AuthorDate: Mon Nov 25 00:37:36 2024 +0900
BIGTOP-4269. Add provisioner config for Debian 12 and Ubuntu 24.04. (#1305)
---
bigtop-deploy/puppet/manifests/bigtop_repo.pp | 4 +--
bigtop-deploy/puppet/manifests/cluster.pp | 2 +-
bigtop-deploy/puppet/manifests/site.pp | 2 +-
.../docker/config_debian-12.yaml | 37 +++++-----------------
.../docker/config_ubuntu-24.04.yaml | 37 +++++-----------------
5 files changed, 20 insertions(+), 62 deletions(-)
diff --git a/bigtop-deploy/puppet/manifests/bigtop_repo.pp
b/bigtop-deploy/puppet/manifests/bigtop_repo.pp
index bb3b21d78..b52606d1e 100644
--- a/bigtop-deploy/puppet/manifests/bigtop_repo.pp
+++ b/bigtop-deploy/puppet/manifests/bigtop_repo.pp
@@ -77,7 +77,7 @@ class bigtop_repo {
if ($bigtop_repo_gpg_check) {
apt::conf { "remove_disable_keys":
- content => "APT::Get::AllowUnauthenticated
1;\nAcquire::AllowInsecureRepositories \"true\";",
+ content => "APT::Get::AllowUnauthenticated
1;\nAcquire::AllowInsecureRepositories
\"true\";\nAPT::AllowInsecureRepositories \"true\";",
ensure => absent
}
apt::key { "add_key":
@@ -93,7 +93,7 @@ class bigtop_repo {
}
} else {
apt::conf { "disable_keys":
- content => "APT::Get::AllowUnauthenticated
1;\nAcquire::AllowInsecureRepositories \"true\";",
+ content => "APT::Get::AllowUnauthenticated
1;\nAcquire::AllowInsecureRepositories
\"true\";\nAPT::AllowInsecureRepositories \"true\";",
ensure => present
}
}
diff --git a/bigtop-deploy/puppet/manifests/cluster.pp
b/bigtop-deploy/puppet/manifests/cluster.pp
index 2cfca0da8..6d6af250b 100644
--- a/bigtop-deploy/puppet/manifests/cluster.pp
+++ b/bigtop-deploy/puppet/manifests/cluster.pp
@@ -187,7 +187,7 @@ class node_with_roles ($roles = hiera("bigtop::roles"))
inherits hadoop_cluster_
class node_with_components inherits hadoop_cluster_node {
# Ensure (even if a single value) that the type is an array.
- if (is_array($cluster_components)) {
+ if ($cluster_components =~ Array) {
$components_array = $cluster_components
} else {
if ($cluster_components == undef) {
diff --git a/bigtop-deploy/puppet/manifests/site.pp
b/bigtop-deploy/puppet/manifests/site.pp
index a78bb4be1..aea2a20d2 100644
--- a/bigtop-deploy/puppet/manifests/site.pp
+++ b/bigtop-deploy/puppet/manifests/site.pp
@@ -24,7 +24,7 @@ if ($provision_repo) {
node default {
$roles_enabled = hiera("bigtop::roles_enabled", false)
- if (!is_bool($roles_enabled)) {
+ if ($roles_enabled !~ Boolean) {
fail("bigtop::roles hiera conf is not of type boolean. It should be set to
either true or false")
}
diff --git a/bigtop-deploy/puppet/manifests/site.pp
b/provisioner/docker/config_debian-12.yaml
similarity index 54%
copy from bigtop-deploy/puppet/manifests/site.pp
copy to provisioner/docker/config_debian-12.yaml
index a78bb4be1..5388dc4b5 100644
--- a/bigtop-deploy/puppet/manifests/site.pp
+++ b/provisioner/docker/config_debian-12.yaml
@@ -13,33 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-require jdk
-Class['jdk'] -> Service<||>
+docker:
+ memory_limit: "4g"
+ image: "bigtop/puppet:trunk-debian-12"
-$provision_repo = hiera("bigtop::provision_repo", true)
-if ($provision_repo) {
- require bigtop_repo
-}
-
-node default {
- $roles_enabled = hiera("bigtop::roles_enabled", false)
-
- if (!is_bool($roles_enabled)) {
- fail("bigtop::roles hiera conf is not of type boolean. It should be set to
either true or false")
- }
-
- if ($roles_enabled) {
- include node_with_roles
- } else {
- include node_with_components
- }
-
- include python
-}
-
-if versioncmp($::puppetversion,'3.6.1') >= 0 {
- $allow_virtual_packages = hiera('bigtop::allow_virtual_packages',false)
- Package {
- allow_virtual => $allow_virtual_packages,
- }
-}
+repo: "http://repos.bigtop.apache.org/releases/3.3.0/debian/12/$(ARCH)"
+distro: debian
+components: [hdfs, yarn, mapreduce]
+enable_local_repo: false
+smoke_test_components: [hdfs, yarn, mapreduce]
diff --git a/bigtop-deploy/puppet/manifests/site.pp
b/provisioner/docker/config_ubuntu-24.04.yaml
similarity index 54%
copy from bigtop-deploy/puppet/manifests/site.pp
copy to provisioner/docker/config_ubuntu-24.04.yaml
index a78bb4be1..8bec05ee2 100644
--- a/bigtop-deploy/puppet/manifests/site.pp
+++ b/provisioner/docker/config_ubuntu-24.04.yaml
@@ -13,33 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-require jdk
-Class['jdk'] -> Service<||>
+docker:
+ memory_limit: "4g"
+ image: "bigtop/puppet:trunk-ubuntu-24.04"
-$provision_repo = hiera("bigtop::provision_repo", true)
-if ($provision_repo) {
- require bigtop_repo
-}
-
-node default {
- $roles_enabled = hiera("bigtop::roles_enabled", false)
-
- if (!is_bool($roles_enabled)) {
- fail("bigtop::roles hiera conf is not of type boolean. It should be set to
either true or false")
- }
-
- if ($roles_enabled) {
- include node_with_roles
- } else {
- include node_with_components
- }
-
- include python
-}
-
-if versioncmp($::puppetversion,'3.6.1') >= 0 {
- $allow_virtual_packages = hiera('bigtop::allow_virtual_packages',false)
- Package {
- allow_virtual => $allow_virtual_packages,
- }
-}
+repo: "http://repos.bigtop.apache.org/releases/3.3.0/ubuntu/24.04/$(ARCH)"
+distro: debian
+components: [hdfs, yarn, mapreduce]
+enable_local_repo: false
+smoke_test_components: [hdfs, yarn, mapreduce]
