Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341825 )
Change subject: mariadb: Decouple mariadb::misc role to a separate file
......................................................................
mariadb: Decouple mariadb::misc role to a separate file
Bug: T150850
Change-Id: I6eec1a62badb7429ec4e9705c62bb91c1f8b2192
---
M modules/role/manifests/mariadb.pp
A modules/role/manifests/mariadb/misc.pp
2 files changed, 54 insertions(+), 54 deletions(-)
Approvals:
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index ffc2cff..3b712e9 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -203,60 +203,6 @@
}
}
-# miscellaneous services clusters
-class role::mariadb::misc(
- $shard = 'm1',
- $master = false,
- ) {
-
- system::role { 'role::mariadb::misc':
- description => "Misc Services Database ${shard}",
- }
-
- $read_only = $master ? {
- true => 0,
- false => 1,
- }
-
- $mysql_role = $master ? {
- true => 'master',
- false => 'slave',
- }
-
- include ::standard
- include role::mariadb::monitor
- include passwords::misc::scripts
- include role::mariadb::ferm
- class { 'role::mariadb::groups':
- mysql_group => 'misc',
- mysql_shard => $shard,
- mysql_role => $mysql_role,
- }
-
- include mariadb::packages_wmf
- include mariadb::service
-
- class { 'mariadb::config':
- config => 'role/mariadb/mysqld_config/misc.my.cnf.erb',
- datadir => '/srv/sqldata',
- tmpdir => '/srv/tmp',
- ssl => 'puppet-cert',
- read_only => $read_only,
- }
-
- class { 'role::mariadb::grants::production':
- shard => $shard,
- prompt => "MISC ${shard}",
- password => $passwords::misc::scripts::mysql_root_pass,
- }
-
- class { 'mariadb::heartbeat':
- shard => $shard,
- datacenter => $::site,
- enabled => $master,
- }
-}
-
# Phab pretty much requires its own sandbox
# strict sql_mode -- nice! but other services moan
# admin tool that needs non-trivial permissions
diff --git a/modules/role/manifests/mariadb/misc.pp
b/modules/role/manifests/mariadb/misc.pp
new file mode 100644
index 0000000..299c7bc
--- /dev/null
+++ b/modules/role/manifests/mariadb/misc.pp
@@ -0,0 +1,54 @@
+# miscellaneous services clusters
+class role::mariadb::misc(
+ $shard = 'm1',
+ $master = false,
+ ) {
+
+ system::role { 'role::mariadb::misc':
+ description => "Misc Services Database ${shard}",
+ }
+
+ $read_only = $master ? {
+ true => 0,
+ false => 1,
+ }
+
+ $mysql_role = $master ? {
+ true => 'master',
+ false => 'slave',
+ }
+
+ include ::standard
+ include role::mariadb::monitor
+ include passwords::misc::scripts
+ include role::mariadb::ferm
+ class { 'role::mariadb::groups':
+ mysql_group => 'misc',
+ mysql_shard => $shard,
+ mysql_role => $mysql_role,
+ }
+
+ include mariadb::packages_wmf
+ include mariadb::service
+
+ class { 'mariadb::config':
+ config => 'role/mariadb/mysqld_config/misc.my.cnf.erb',
+ datadir => '/srv/sqldata',
+ tmpdir => '/srv/tmp',
+ ssl => 'puppet-cert',
+ read_only => $read_only,
+ }
+
+ class { 'role::mariadb::grants::production':
+ shard => $shard,
+ prompt => "MISC ${shard}",
+ password => $passwords::misc::scripts::mysql_root_pass,
+ }
+
+ class { 'mariadb::heartbeat':
+ shard => $shard,
+ datacenter => $::site,
+ enabled => $master,
+ }
+}
+
--
To view, visit https://gerrit.wikimedia.org/r/341825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6eec1a62badb7429ec4e9705c62bb91c1f8b2192
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
