Ottomata has submitted this change and it was merged.
Change subject: Creating role::analytics::packages class, installing
python-lxml package
......................................................................
Creating role::analytics::packages class, installing python-lxml package
Change-Id: Ib1cd4dd8570215ff79b7abef3528dc9dc6652e16
---
M manifests/role/analytics.pp
1 file changed, 21 insertions(+), 8 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 9a8bfc5..ce328f8 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -19,14 +19,8 @@
# 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
+ # include common analytics packages
+ include role::analytics::packages
# Include these common classes on all analytics nodes.
# (for now we only include these on reinstalled and
@@ -76,6 +70,25 @@
sudo_user { [ "diederik", "dsc", "otto" ]: privileges => ['ALL = (ALL)
NOPASSWD: ALL'] }
}
+# includes packages common to analytics nodes
+class role::analytics::packages {
+ # 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
+
+ # need python-lxml to try out check_ganglia
+ # (https://github.com/larsks/check_ganglia)
+ if !defined(Package['python-lxml']) {
+ package { 'python-lxml':
+ ensure => 'installed',
+ }
+ }
+}
+
+
class role::analytics::java {
# all analytics nodes need java installed
--
To view, visit https://gerrit.wikimedia.org/r/71078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1cd4dd8570215ff79b7abef3528dc9dc6652e16
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
