Elukey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402050 )
Change subject: profile::hadoop: set hiera defaults to ease labs deployments
......................................................................
profile::hadoop: set hiera defaults to ease labs deployments
Bug: T167790
Change-Id: Ifb5bbce5d6919ac220f9004fc7d24f52c4ef8912
---
M modules/profile/manifests/hadoop/logstash.pp
M modules/profile/manifests/hadoop/master.pp
M modules/profile/manifests/hadoop/master/standby.pp
M modules/profile/manifests/hadoop/worker.pp
4 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/402050/1
diff --git a/modules/profile/manifests/hadoop/logstash.pp
b/modules/profile/manifests/hadoop/logstash.pp
index a454109..aca0eda 100644
--- a/modules/profile/manifests/hadoop/logstash.pp
+++ b/modules/profile/manifests/hadoop/logstash.pp
@@ -2,7 +2,7 @@
# Enables gelf logging to logstash from Hadoop.
# As of 2016-02, this is not used.
class profile::hadoop::logstash (
- $gelf_logging_enabled = hiera('profile::hadoop::logstash::enabled'),
+ $gelf_logging_enabled = hiera('profile::hadoop::logstash::enabled', false),
) {
file { '/usr/local/bin/hadoop-yarn-logging-helper.sh':
content => template('profile/hadoop/hadoop-yarn-logging-helper.erb'),
diff --git a/modules/profile/manifests/hadoop/master.pp
b/modules/profile/manifests/hadoop/master.pp
index 98ec3b6..2843d71 100644
--- a/modules/profile/manifests/hadoop/master.pp
+++ b/modules/profile/manifests/hadoop/master.pp
@@ -4,12 +4,15 @@
#
# == Parameters
#
+# [*hadoop_namenode_heapsize*]
+# Current JVM heap size to use as threshold for monitoring.
+#
# [*monitoring_enabled*]
# If production monitoring needs to be enabled or not.
#
class profile::hadoop::master(
- $monitoring_enabled =
hiera('profile::hadoop::master::monitoring_enabled'),
- $hadoop_namenode_heapsize =
hiera('profile::hadoop::master::namenode_heapsize'),
+ $monitoring_enabled =
hiera('profile::hadoop::master::monitoring_enabled', false),
+ $hadoop_namenode_heapsize =
hiera('profile::hadoop::master::namenode_heapsize', 2048),
$statsd = hiera('statsd'),
){
diff --git a/modules/profile/manifests/hadoop/master/standby.pp
b/modules/profile/manifests/hadoop/master/standby.pp
index 6a98a36..ddbf1bb 100644
--- a/modules/profile/manifests/hadoop/master/standby.pp
+++ b/modules/profile/manifests/hadoop/master/standby.pp
@@ -2,12 +2,15 @@
#
# Sets up a standby/backup Hadoop Master node.
#
+# [*hadoop_namenode_heapsize*]
+# Current JVM heap size to use as threshold for monitoring.
+#
# [*monitoring_enabled*]
# If production monitoring needs to be enabled or not.
#
class profile::hadoop::master::standby(
- $monitoring_enabled =
hiera('profile::hadoop::standby_master::monitoring_enabled'),
- $hadoop_namenode_heapsize =
hiera('profile::hadoop::standby::namenode_heapsize'),
+ $monitoring_enabled =
hiera('profile::hadoop::standby_master::monitoring_enabled', false),
+ $hadoop_namenode_heapsize =
hiera('profile::hadoop::standby::namenode_heapsize', 2048),
$statsd = hiera('statsd'),
) {
diff --git a/modules/profile/manifests/hadoop/worker.pp
b/modules/profile/manifests/hadoop/worker.pp
index 6895792..6af651b 100644
--- a/modules/profile/manifests/hadoop/worker.pp
+++ b/modules/profile/manifests/hadoop/worker.pp
@@ -8,7 +8,7 @@
# If production monitoring needs to be enabled or not.
#
class profile::hadoop::worker(
- $monitoring_enabled = hiera('profile::hadoop::worker::monitoring_enabled'),
+ $monitoring_enabled = hiera('profile::hadoop::worker::monitoring_enabled',
false),
$statsd = hiera('statsd'),
) {
--
To view, visit https://gerrit.wikimedia.org/r/402050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb5bbce5d6919ac220f9004fc7d24f52c4ef8912
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
