Ottomata has submitted this change and it was merged.
Change subject: Moving java package def into a class for analytics role
......................................................................
Moving java package def into a class for analytics role
Change-Id: I6c2acf2012c9aa445329614ae039cbb409797895
---
M manifests/role/analytics.pp
1 file changed, 16 insertions(+), 11 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 0950678..bf83267 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -1,10 +1,10 @@
# analytics servers (RT-1985)
-@monitor_group { "analytics-eqiad": description => "analytics servers in
eqiad" }
+@monitor_group { 'analytics-eqiad': description => 'analytics servers in
eqiad' }
class role::analytics {
- system_role { "role::analytics": description => "analytics server" }
- $nagios_group = "analytics-eqiad"
+ system_role { 'role::analytics': description => 'analytics server' }
+ $nagios_group = 'analytics-eqiad'
# ganglia cluster name.
$cluster = "analytics"
@@ -19,19 +19,14 @@
# include analytics user accounts
include role::analytics::users
+ # include java on all analytics servers
+ include role::analytics::java
+
# We want to be able to geolocate IP addresses
include geoip
# udp-filter is a useful thing!
include misc::udp2log::udp_filter
-
- # all analytics nodes need java installed
- # Install Sun/Oracle Java JDK on analytics cluster
- java { "java-6-oracle":
- distribution => 'oracle',
- version => 6,
- }
-
# Include these common classes on all analytics nodes.
# (for now we only include these on reinstalled and
@@ -81,6 +76,16 @@
}
+class role::analytics::java {
+ # all analytics nodes need java installed
+ # Install Sun/Oracle Java JDK on analytics cluster
+ java { 'java-6-oracle':
+ distribution => 'oracle',
+ version => 6,
+ }
+}
+
+
# front end interfaces for Kraken and Hadoop
class role::analytics::frontend inherits role::analytics {
# include a mysql database for Sqoop and Oozie
--
To view, visit https://gerrit.wikimedia.org/r/70206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c2acf2012c9aa445329614ae039cbb409797895
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
