Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158791
Change subject: Update analytics role and cdh module to work with Trusty
......................................................................
Update analytics role and cdh module to work with Trusty
Change-Id: I702664d6437949bc4381cfd6c22607a71bdc90f7
---
M puppet/modules/cdh
M puppet/modules/role/manifests/analytics.pp
M puppet/modules/role/manifests/hive.pp
M puppet/modules/role/manifests/oozie.pp
4 files changed, 30 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/91/158791/1
diff --git a/puppet/modules/cdh b/puppet/modules/cdh
index aab9776..65335f7 160000
--- a/puppet/modules/cdh
+++ b/puppet/modules/cdh
-Subproject commit aab9776e9d17a13c194222bd017424026211b65f
+Subproject commit 65335f7d027c635065966a15a7b4467c1ce311b5
diff --git a/puppet/modules/role/manifests/analytics.pp
b/puppet/modules/role/manifests/analytics.pp
index b5d3402..c5d99c5 100644
--- a/puppet/modules/role/manifests/analytics.pp
+++ b/puppet/modules/role/manifests/analytics.pp
@@ -29,6 +29,7 @@
# line in site.pp. You'll end up installing much less stuff.
#
class role::analytics {
+ include ::role::analytics::apt
include ::role::hadoop
include ::role::hive
include ::role::oozie
@@ -36,5 +37,31 @@
# do not need their own role classes.
include ::cdh::pig
include ::cdh::sqoop
- include ::role::hue
+
+ # Hue does not currently work with Trusty :(
+ # Need to solve this error:
+ # File
"/usr/lib/hue/build/env/lib/python2.7/site-packages/python_daemon-1.5.1-py2.7.egg/daemon/daemon.py",
line 25, in <module>
+ # import resource
+ # ImportError: No module named resource
+ # I think this has something to do with the fact that
+ # this symlink is broken in Trusty:
+ # /usr/lib/hue/build/env/lib/python2.7/config -> /usr/lib/python2.7/config
+ #include ::role::hue
}
+
+
+class role::analytics::apt {
+ include ::apt
+
+ # CDH packages are not yet packaged for Trusty.
+ # In the meantime, we allow Vagrant Trusty to
+ # install Precise packages.
+ file { '/etc/apt/sources.list.d/wikimedia-precise.list':
+ content => '# Include precise packages so that CDH can be installed in
Trusty.
+# This file is managed by Puppet.
+#
+deb http://apt.wikimedia.org/wikimedia precise-wikimedia main universe
+deb-src http://apt.wikimedia.org/wikimedia precise-wikimedia main universe',
+ notify => Exec['update_package_index'],
+ }
+}
\ No newline at end of file
diff --git a/puppet/modules/role/manifests/hive.pp
b/puppet/modules/role/manifests/hive.pp
index 179a541..2266de8 100644
--- a/puppet/modules/role/manifests/hive.pp
+++ b/puppet/modules/role/manifests/hive.pp
@@ -2,7 +2,7 @@
# Installs and runs hive client, hive metastore and hive server.
class role::hive {
require ::role::hadoop
- include ::mysql
+ require ::mysql
# Need hadoop up and running and configs defined first.
Class['role::hadoop'] -> Class['role::hive']
diff --git a/puppet/modules/role/manifests/oozie.pp
b/puppet/modules/role/manifests/oozie.pp
index b194b99..ae6ab37 100644
--- a/puppet/modules/role/manifests/oozie.pp
+++ b/puppet/modules/role/manifests/oozie.pp
@@ -2,6 +2,7 @@
# Install Oozie server and client.
#
class role::oozie {
+ require ::mysql
require ::role::hadoop
include ::cdh::oozie
include ::cdh::oozie::server
--
To view, visit https://gerrit.wikimedia.org/r/158791
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I702664d6437949bc4381cfd6c22607a71bdc90f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
