Ottomata has submitted this change and it was merged.
Change subject: Puppetizing analytics1018 as hadoop worker
......................................................................
Puppetizing analytics1018 as hadoop worker
Change-Id: I27a5fa5034cce93f4b4a3ab638c1e05704c08f68
---
M manifests/role/analytics.pp
M manifests/role/analytics/hadoop.pp
M manifests/site.pp
3 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index bf83267..7738e0d 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -31,7 +31,7 @@
# Include these common classes on all analytics nodes.
# (for now we only include these on reinstalled and
# fully puppetized nodes.)
- if ($hostname =~ /analytics10(19|20)/) {
+ if ($hostname =~ /analytics10(1[8-9]|20)/) {
include role::analytics::pig
include role::analytics::hive
include role::analytics::sqoop
diff --git a/manifests/role/analytics/hadoop.pp
b/manifests/role/analytics/hadoop.pp
index c05179a..6a642ea 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -22,6 +22,9 @@
# Installs base configs for Hadoop nodes
#
class role::analytics::hadoop {
+ # need java before hadoop is installed
+ require role::analytics::java
+
# include common labs or production hadoop configs
# based on $::realm
if ($::realm == 'labs') {
diff --git a/manifests/site.pp b/manifests/site.pp
index e02c4ec..8b4e6df 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -137,7 +137,7 @@
}
# analytics1011-analytics1020 are Hadoop Worker nodes
-node /analytics10(19|20).eqiad.wmnet/ {
+node /analytics10(1[8-9]|20).eqiad.wmnet/ {
include role::analytics
include role::analytics::hadoop::worker
}
@@ -188,7 +188,7 @@
}
# analytics1007, analytics1009-analytics1018, analytics1023-analytics1027
-node /analytics10(0[7]|1[0-8]|2[234567])\.eqiad\.wmnet/ {
+node /analytics10(0[7]|1[0-7]|2[234567])\.eqiad\.wmnet/ {
# ganglia aggregator for the Analytics cluster.
if ($hostname == "analytics1011") {
$ganglia_aggregator = true
--
To view, visit https://gerrit.wikimedia.org/r/70208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I27a5fa5034cce93f4b4a3ab638c1e05704c08f68
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
