Ottomata has submitted this change and it was merged.
Change subject: Remove some unsed role::analytics::* classes, more to come
......................................................................
Remove some unsed role::analytics::* classes, more to come
Bug: T109859
Change-Id: I5b5cb1bcb42062fe0d124403ac3033ae6edad2f9
---
M manifests/role/analytics.pp
M manifests/site.pp
2 files changed, 7 insertions(+), 78 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 dc00ea9..81a9b5c 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -16,39 +16,6 @@
}
}
-# == Class role::analytics::clients
-# Includes common client classes for
-# working with hadoop and other analytics services.
-class role::analytics::clients {
- include role::analytics
-
- # Include Hadoop ecosystem client classes.
- include role::analytics::hadoop::client,
- role::analytics::hive::client,
- role::analytics::oozie::client,
- role::analytics::pig,
- role::analytics::sqoop,
- role::analytics::mahout,
- role::analytics::spark
-
- # Mount HDFS via Fuse on Analytics client nodes.
- # This will mount HDFS at /mnt/hdfs read only.
- class { 'cdh::hadoop::mount':
- # Make sure this package is removed before
- # cdh::hadoop::mount evaluates.
- require => Package['icedtea-7-jre-jamvm'],
- }
-
- # These packages are useful, install them.
- ensure_packages([
- 'ipython-notebook',
- 'kafkacat',
- ])
-
- # include maven to build jars for Hadoop.
- include ::maven
-}
-
# == Class role::analytics::hadoop::monitor_disks
# Installs monitoring plugins for disks
#
@@ -57,47 +24,4 @@
ganglia::plugin::python { 'diskstat': }
}
-}
-
-# == Class role::analytics::password::research
-# Install the researcher MySQL username and password
-# into a file and make it readable by analytics-privatedata-users
-#
-class role::analytics::password::research {
- include passwords::mysql::research
-
- mysql::config::client { 'analytics-research':
- user => $::passwords::mysql::research::user,
- pass => $::passwords::mysql::research::pass,
- group => 'analytics-privatedata-users',
- mode => '0440',
- }
-}
-
-
-# == Class role::analytics::rsyncd
-# Set up an rsync module at certain paths to
-# allow read only rsync access to analytics generated data.
-#
-class role::analytics::rsyncd {
-
- $hosts_allow = [
- 'stat1001.eqiad.wmnet',
- 'stat1002.eqiad.wmnet',
- 'stat1003.eqiad.wmnet',
- 'analytics1027.eqiad.wmnet',
- 'dataset1001.wikimedia.org',
- ]
-
- # This will allow $hosts_allow to host public data files
- # generated by the analytics cluster.
- # Note that this requires that cdh::hadoop::mount
- # be present and mounted at /mnt/hdfs
- rsync::server::module { 'hdfs-archive':
- path => "${::cdh::hadoop::mount::mount_point}/wmf/data/archive",
- read_only => 'yes',
- list => 'yes',
- hosts_allow => $hosts_allow,
- require => Class['cdh::hadoop::mount'],
- }
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 00695e5..4bf9846 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2412,8 +2412,13 @@
# /etc/mysql/conf.d/analytics-research-client.cnf
# and only readable by users in the
# analytics-privatedata-users group.
- # TODO: Move this to analytics_cluster role.
- include role::analytics::password::research
+ include passwords::mysql::research
+ mysql::config::client { 'analytics-research':
+ user => $::passwords::mysql::research::user,
+ pass => $::passwords::mysql::research::pass,
+ group => 'analytics-privatedata-users',
+ mode => '0440',
+ }
# The eventlogging code is useful for scripting
# EventLogging consumers. Install this on
--
To view, visit https://gerrit.wikimedia.org/r/270808
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b5cb1bcb42062fe0d124403ac3033ae6edad2f9
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
