Springle has submitted this change and it was merged.
Change subject: switch dstore dumps to /srv
......................................................................
switch dstore dumps to /srv
Change-Id: I2a0dfb5cd1952dd35a50d451f3c69391eb996cfa
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 13 deletions(-)
Approvals:
Springle: Looks good to me, approved
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 18992ad..e92ff0a 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -204,20 +204,9 @@
mariadb::monitor_replication { ['s1','s2','m2']: }
}
-class role::mariadb::backup::config {
- if $mariadb_backups_folder {
- $folder = $mariadb_backups_folder
- } else {
- $folder = '/srv/backups'
- }
-}
-
class role::mariadb::backup {
include role::backup::host
include passwords::mysql::dump
-
- include role::mariadb::backup::config
- $backups_folder = $role::mariadb::backup::config::folder
file { $backups_folder:
ensure => directory,
@@ -238,7 +227,7 @@
xtrabackup => false,
per_db => true,
innodb_only => true,
- local_dump_dir => $backups_folder,
+ local_dump_dir => '/srv/backups',
password_file => '/etc/mysql/conf.d/dumps.cnf',
method => 'predump',
mysql_binary => '/usr/local/bin/mysql',
diff --git a/manifests/site.pp b/manifests/site.pp
index d26d436..9bf8fcb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -967,7 +967,6 @@
include admin
$cluster = 'mysql'
$ganglia_aggregator = true
- $mariadb_backups_folder = '/a/backups'
include role::mariadb::backup
# 24h delay on all repl streams
class { 'role::mariadb::dbstore':
--
To view, visit https://gerrit.wikimedia.org/r/187044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a0dfb5cd1952dd35a50d451f3c69391eb996cfa
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Springle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
