Ottomata has submitted this change and it was merged. Change subject: Reverting change to install OpenJDK 7 on analytics nodes. ......................................................................
Reverting change to install OpenJDK 7 on analytics nodes. See: http://wiki.apache.org/hadoop/HadoopJavaVersions http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Release-Notes/cdh4rn_topic_2_2.html "Note*: OpenJDK6 has some open bugs w.r.t handling of generics (https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/611284, https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/716959), so OpenJDK cannot be used to compile hadoop mapreduce code in branch-0.23 and beyond, please use other JDKs." "MRv2 (YARN) is not supported on JDK 7 at present, because of MAPREDUCE-2264. This problem is expected to be fixed in an upcoming release." Change-Id: I36a3e7df237021723e2a04d669c099f319dddf69 --- M manifests/role/analytics.pp 1 file changed, 7 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 7510c98..f211f50 100644 --- a/manifests/role/analytics.pp +++ b/manifests/role/analytics.pp @@ -19,14 +19,18 @@ # include analytics user accounts include role::analytics::users - # all analytics nodes need java installed - 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, + } } # Contains list of reinstalled analytics nodes. @@ -37,35 +41,6 @@ 'analytics1001', 'analytics1020', ] -} - -class role::analytics::java { - # Most analytics nodes currently are running - # Sun/Oracle Java 6. As we reinstall these nodes, - # we want to switch over to Java 7. - # The following conditional will be removed once - # all nodes have been reinstalled. - include role::analytics::reinstalled - - if (member($role::analytics::reinstalled::nodes, $hostname)) { - java { "java-7-openjdk": - distribution => 'openjdk', - version => 7, - } - # Install Sun/Oracle Java JDK on analytics cluster - java { "java-6-oracle": - distribution => 'oracle', - version => 6, - ensure => 'absent' - } - } - else { - # Install Sun/Oracle Java JDK on analytics cluster - java { "java-6-oracle": - distribution => 'oracle', - version => 6, - } - } } class role::analytics::users { -- To view, visit https://gerrit.wikimedia.org/r/67837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36a3e7df237021723e2a04d669c099f319dddf69 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
