Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401904 )
Change subject: profile::hadoop::master: remove the last hadoop cdh auto-lookup
......................................................................
profile::hadoop::master: remove the last hadoop cdh auto-lookup
Bug: T167790
Change-Id: Ifde824c1213da10b68164b5f9a20416d1093c58c
---
D hieradata/common/cdh/hadoop/users.yaml
M hieradata/role/common/analytics_cluster/hadoop/master.yaml
M modules/profile/manifests/hadoop/master.pp
3 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Ottomata: Looks good to me, but someone else must approve
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/cdh/hadoop/users.yaml
b/hieradata/common/cdh/hadoop/users.yaml
deleted file mode 100644
index fd51433..0000000
--- a/hieradata/common/cdh/hadoop/users.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ensure that users in these posix groups have home directories in HDFS.
-cdh::hadoop::users::groups: "analytics-users analytics-privatedata-users
analytics-admins analytics-search-users"
diff --git a/hieradata/role/common/analytics_cluster/hadoop/master.yaml
b/hieradata/role/common/analytics_cluster/hadoop/master.yaml
index f257b36..210458a 100644
--- a/hieradata/role/common/analytics_cluster/hadoop/master.yaml
+++ b/hieradata/role/common/analytics_cluster/hadoop/master.yaml
@@ -20,6 +20,9 @@
# Used to set up jvm heap size usage thresholds
profile::hadoop::master::namenode_heapsize: 6144
+# Ensure that users in these posix groups have home directories in HDFS.
+profile::hadoop::master::hadoop_user_groups: "analytics-users
analytics-privatedata-users analytics-admins analytics-search-users"
+
# Prometheus JMX Exporter config templates.
profile::hadoop::common::hadoop_namenode_opts: "-Xms6144m -Xmx6144m
-javaagent:/usr/share/java/prometheus/jmx_prometheus_javaagent.jar=%{::ipaddress}:10080:/etc/hadoop/prometheus_hdfs_namenode_jmx_exporter.yaml"
profile::hadoop::common::yarn_resourcemanager_opts: "-Xms2048m
-javaagent:/usr/share/java/prometheus/jmx_prometheus_javaagent.jar=%{::ipaddress}:10083:/etc/hadoop/prometheus_yarn_resourcemanager_jmx_exporter.yaml"
diff --git a/modules/profile/manifests/hadoop/master.pp
b/modules/profile/manifests/hadoop/master.pp
index 98ec3b6..ecd11c5 100644
--- a/modules/profile/manifests/hadoop/master.pp
+++ b/modules/profile/manifests/hadoop/master.pp
@@ -10,6 +10,7 @@
class profile::hadoop::master(
$monitoring_enabled =
hiera('profile::hadoop::master::monitoring_enabled'),
$hadoop_namenode_heapsize =
hiera('profile::hadoop::master::namenode_heapsize'),
+ $hadoop_user_groups =
hiera('profile::hadoop::master::hadoop_user_groups'),
$statsd = hiera('statsd'),
){
@@ -28,6 +29,7 @@
# where all users that want to use Hadoop
# must have shell accounts anyway.
class { '::cdh::hadoop::users':
+ groups => $hadoop_user_groups,
require => Class['cdh::hadoop::master'],
}
--
To view, visit https://gerrit.wikimedia.org/r/401904
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifde824c1213da10b68164b5f9a20416d1093c58c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Ottomata <ao...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
