Jcrespo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404323 )
Change subject: mariadb: Set as spares labsdb1001 and labsdb1003
......................................................................
mariadb: Set as spares labsdb1001 and labsdb1003
Also removing rests of old labsdb role.
Bug: T142807
Change-Id: I8195d0448c9fba17a6f8d954c01bd0eee98f465a
---
M manifests/site.pp
D modules/role/manifests/mariadb/labs_deprecated.pp
2 files changed, 5 insertions(+), 62 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/404323/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 271887a..6f9258b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1165,11 +1165,6 @@
}
## labsdb dbs
-node /labsdb100[13]\.eqiad\.wmnet/ {
- # this role is depecated and its nodes scheduled for decom
- role(mariadb::labs_deprecated)
-}
-
node /labsdb10(09|10|11)\.eqiad\.wmnet/ {
role(labs::db::replica)
}
@@ -1191,6 +1186,11 @@
role(osm::master)
}
+# old labsdbs, to be decommed. T142807
+node /labsdb100[13]\.eqiad\.wmnet/ {
+ role(spare::system)
+}
+
node /labstore100[12]\.eqiad\.wmnet/ {
# soon to be recommissioned in T158196
include ::standard
diff --git a/modules/role/manifests/mariadb/labs_deprecated.pp
b/modules/role/manifests/mariadb/labs_deprecated.pp
deleted file mode 100644
index b943b21..0000000
--- a/modules/role/manifests/mariadb/labs_deprecated.pp
+++ /dev/null
@@ -1,57 +0,0 @@
-# MariaDB 10 labsdb multiple-shards slave.
-# This role is deprecated but still in use.
-# Use role::labs::db::replica instead
-class role::mariadb::labs_deprecated {
-
- system::role { 'mariadb::labs_deprecated':
- description => 'Labs DB Slave (deprecated role)',
- }
-
- include ::standard
- include ::profile::mariadb::monitor
- include passwords::misc::scripts
- include role::mariadb::ferm
- include ::profile::base::firewall
- include role::labs::db::common
- include role::labs::db::views
- include role::labs::db::check_private_data
-
- class { 'profile::mariadb::monitor::prometheus':
- mysql_group => 'labs',
- mysql_role => 'slave',
- socket => '/tmp/mysql.sock',
- }
-
- include mariadb::packages_wmf
- include mariadb::service
-
- class { 'mariadb::config':
- config => 'role/mariadb/mysqld_config/labs.my.cnf.erb',
- datadir => '/srv/sqldata',
- tmpdir => '/srv/tmp',
- }
-
- file { '/srv/innodb':
- ensure => directory,
- owner => 'mysql',
- group => 'mysql',
- mode => '0755',
- }
-
- file { '/srv/tokudb':
- ensure => directory,
- owner => 'mysql',
- group => 'mysql',
- mode => '0755',
- }
-
- # Required for TokuDB to start
- # See
https://mariadb.com/kb/en/mariadb/enabling-tokudb/#check-for-transparent-hugepage-support-on-linux
- sysfs::parameters { 'disable-transparent-hugepages':
- values => {
- 'kernel/mm/transparent_hugepage/enabled' => 'never',
- 'kernel/mm/transparent_hugepage/defrag' => 'never',
- }
- }
-}
-
--
To view, visit https://gerrit.wikimedia.org/r/404323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8195d0448c9fba17a6f8d954c01bd0eee98f465a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
