Ottomata has submitted this change and it was merged.
Change subject: Including role::analytics::hadoop::worker on analytics1019 and
analytics1020
......................................................................
Including role::analytics::hadoop::worker on analytics1019 and analytics1020
Change-Id: I2a07806cf1dec67fa41e92c4223cb8b500367688
---
M manifests/role/analytics.pp
M manifests/role/analytics/hadoop.pp
M manifests/site.pp
3 files changed, 16 insertions(+), 32 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 f211f50..ce094c0 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -31,16 +31,16 @@
distribution => 'oracle',
version => 6,
}
-}
-# Contains list of reinstalled analytics nodes.
-# Once all analytics nodes are reinstalled, this
-# class will be removed.
-class role::analytics::reinstalled {
- $nodes = [
- 'analytics1001',
- 'analytics1020',
- ]
+
+ # 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)/) {
+ include role::analytics::pig
+ include role::analytics::hive
+ include role::analytics::sqoop
+ }
}
class role::analytics::users {
@@ -77,6 +77,7 @@
sudo_user { [ "diederik", "dsc", "otto" ]: privileges => ['ALL = (ALL)
NOPASSWD: ALL'] }
}
+
# front end interfaces for Kraken and Hadoop
class role::analytics::frontend inherits role::analytics {
# include a mysql database for Sqoop and Oozie
diff --git a/manifests/role/analytics/hadoop.pp
b/manifests/role/analytics/hadoop.pp
index fd3757a..c05179a 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -99,10 +99,6 @@
content => template('hadoop/fair-scheduler-allocation.xml.erb'),
require => Class['cdh4::hadoop'],
}
-
- include cdh4::hive
- include cdh4::pig
- include cdh4::sqoop
}
@@ -144,10 +140,6 @@
content => template('hadoop/fair-scheduler-allocation.xml.erb'),
require => Class['cdh4::hadoop'],
}
-
- include cdh4::hive
- include cdh4::pig
- include cdh4::sqoop
}
diff --git a/manifests/site.pp b/manifests/site.pp
index ebee377..06c2ea1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -136,14 +136,11 @@
include misc::udp2log::iptables
}
-# analytics1020 is a Hadoop Worker
-node "analytics1020.eqiad.wmnet" {
+# analytics1011-analytics1020 are Hadoop Worker nodes
+node /analytics10(19|20).eqiad.wmnet/ {
include role::analytics
+ include role::analytics::hadoop::worker
}
-
-
-
-
### Analytics nodes below this line need to be reinstalled.
@@ -190,8 +187,8 @@
include role::analytics::kafka::server
}
-# analytics1007, analytics1009-analytics1020, analytics1023-analytics1027
-node /analytics10(0[7]|1[0-9]|2[234567])\.eqiad\.wmnet/ {
+# analytics1007, analytics1009-analytics1018, analytics1023-analytics1027
+node /analytics10(0[7]|1[0-8]|2[234567])\.eqiad\.wmnet/ {
# ganglia aggregator for the Analytics cluster.
if ($hostname == "analytics1011") {
$ganglia_aggregator = true
@@ -200,13 +197,7 @@
include role::analytics
}
-# # analytics1011-analytics1020 are Kraken Hadoop Datanodes.
-# # TODO: Puppetize all Hadoop Datanodes. analytics1020
-# # is being used as the first puppetization test.
-# node "analytics1020.eqiad.wmnet" {
-# include role::analytics
-# include role::hadoop::worker
-# }
+
# analytics1027 hosts the frontend
# interfaces to Kraken and Hadoop.
--
To view, visit https://gerrit.wikimedia.org/r/69518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a07806cf1dec67fa41e92c4223cb8b500367688
Gerrit-PatchSet: 2
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
