Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Revert "Introduce role::mariadb::backup"
......................................................................
Revert "Introduce role::mariadb::backup"
Reverting because needed class passwords::mysql::dump has not yet been
added in the private repo.
This reverts commit 0cdadcd1535862a909ba14e48e7b45716e0b5365.
Change-Id: Ib1ad7b103cde05d7770576ff26b6841b77639173
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 48 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 1a1c62d..3995871 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -140,43 +140,3 @@
mariadb::monitor_replication { ['s1', 'm2' ]: }
}
-
-class role::mariadb::backup::config {
- if $mariadb_backups_folder {
- $folder = $mariadb_backups_folder
- } else {
- $folder = '/srv/backups'
- }
-}
-
-class role::mariadb::backup {
- include backup::host
- include passwords::mysql::dump
-
- include role::mariadb::backup::config
- $backups_folder = $role::mariadb::backup::config::folder
-
- file { $backups_folder:
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0600', # implicitly 0700 for dirs
- }
-
- file { '/etc/mysql/conf.d/dumps.cnf':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0400',
- content =>
"[client]\nuser=${passwords::mysql::dump::user}\npassword=${passwords::mysql::dump::pass}\n",
- }
-
- backup::mysqlset {'dbstore':
- xtrabackup => false,
- per_db => true,
- innodb_only => true,
- local_dump_dir => $backups_folder,
- password_file => '/etc/mysql/conf.d/dumps.cnf',
- method => 'predump',
- }
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 71e96e0..88b8f75 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -847,14 +847,7 @@
include role::mariadb::tendril
}
-node /^dbstore1001\.eqiad\.wmnet/ {
- $cluster = 'mysql'
- $mariadb_backups_folder = '/a/backups'
- include role::mariadb::dbstore
- include role::mariadb::backup
-}
-
-node /^dbstore1002\.eqiad\.wmnet/ {
+node /^dbstore100(1|2)\.eqiad\.wmnet/ {
$cluster = 'mysql'
include role::mariadb::dbstore
}
--
To view, visit https://gerrit.wikimedia.org/r/133696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1ad7b103cde05d7770576ff26b6841b77639173
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
