Ottomata has submitted this change and it was merged.
Change subject: Apply analytics_cluster::database::meta role on analytics1015
......................................................................
Apply analytics_cluster::database::meta role on analytics1015
Remove anoter unused analytics role class
Change-Id: Ia1a6b634f10bb505d3a9e7e0bae237b777129379
---
D manifests/role/analytics/mysql.pp
D manifests/role/analytics/users.pp
M manifests/site.pp
M modules/role/manifests/analytics_cluster/database/meta.pp
4 files changed, 13 insertions(+), 71 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/analytics/mysql.pp
b/manifests/role/analytics/mysql.pp
deleted file mode 100644
index 9df1063..0000000
--- a/manifests/role/analytics/mysql.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-# == Class role::analytics::mysql::meta
-# Installs a MySQL/MariaDB server for use with Hive and Oozie
-#
-class role::analytics::mysql::meta {
- class { 'mariadb::packages_wmf':
- mariadb10 => true
- }
- # This will be included once analytics1015 has been productionized
- # - otto 2015-09-15
- # include role::mariadb::monitor
-
- class { 'mariadb::config':
- config => 'mariadb/analytics-meta.my.cnf.erb',
- datadir => '/var/lib/mysql',
- # analytics1015 in prod is currently a slave, so read_only = true.
- # The new analytics mysql instance will be puppetized using
- # the new role::analytics::database::meta class in the role module.
- read_only => true,
- require => Class['mariadb::packages_wmf'],
- }
-
- file { '/etc/init.d/mysql':
- ensure => link,
- target => '/opt/wmf-mariadb10/service',
- require => Class['mariadb::packages_wmf'],
- }
-
- file { '/usr/local/bin/mysql':
- ensure => link,
- target => '/opt/wmf-mariadb10/bin/mysql',
- require => Class['mariadb::packages_wmf'],
- }
-
- service { 'mysql':
- ensure => 'running',
- enable => true,
- hasrestart => true,
- hasstatus => true,
- require => [File['/etc/init.d/mysql'], Class['mariadb::config']],
- }
-
- # Allow access to this analytics mysql instance from analytics networks
- ferm::service{ 'analytics-mysql-meta':
- proto => 'tcp',
- port => '3306',
- srange => '$ANALYTICS_NETWORKS',
- }
-}
diff --git a/manifests/role/analytics/users.pp
b/manifests/role/analytics/users.pp
deleted file mode 100644
index 8b567f8..0000000
--- a/manifests/role/analytics/users.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-# == Class role::analytics::users
-# Installs any special system users needed on analytics namenodes or clients.
-# This is used for ensuring that users exist for use in HDFS.
-#
-class role::analytics::users {
- # analytics-search user will be use to deploy
- # wikimedia/discovery/analytics into HDFS.
- # The analytics-search-users group will be allowed to
- # sudo -u analytics-search.
- group { 'analytics-search':
- ensure => present,
- }
-
- user { 'analytics-search':
- ensure => present,
- gid => 'analytics-search',
- system => true
- }
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 4bf9846..07c69ff 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -84,7 +84,7 @@
# This node is being repurposed - otto 2015-09
node 'analytics1015.eqiad.wmnet' {
- role analytics::mysql::meta
+ role analytics_cluster::database::meta
include standard
include base::firewall
}
diff --git a/modules/role/manifests/analytics_cluster/database/meta.pp
b/modules/role/manifests/analytics_cluster/database/meta.pp
index f745e0b..4514486 100644
--- a/modules/role/manifests/analytics_cluster/database/meta.pp
+++ b/modules/role/manifests/analytics_cluster/database/meta.pp
@@ -12,10 +12,19 @@
# - otto 2015-09-15
# include role::mariadb::monitor
+
+ # analytics1015 in prod is currently a slave, so read_only = true.
+ # The new analytics mysql instance will be puppetized using
+ # the new role::analytics::database::meta class in the role module.
+ $read_only = $::hostname ? {
+ 'analytics1015' => true,
+ default => false,
+ }
class { 'mariadb::config':
- config => 'mariadb/analytics-meta.my.cnf.erb',
- datadir => '/var/lib/mysql',
- require => Class['mariadb::packages_wmf'],
+ config => 'mariadb/analytics-meta.my.cnf.erb',
+ datadir => '/var/lib/mysql',
+ read_only => $read_only,
+ require => Class['mariadb::packages_wmf'],
}
file { '/etc/init.d/mysql':
--
To view, visit https://gerrit.wikimedia.org/r/270855
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1a6b634f10bb505d3a9e7e0bae237b777129379
Gerrit-PatchSet: 3
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
