[MediaWiki-commits] [Gerrit] Revert Revert Introduce role::mariadb::backup - change (operations/puppet)

2014-05-16 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Revert Revert Introduce role::mariadb::backup
..


Revert Revert Introduce role::mariadb::backup

Reverting the revert. The passwords::mysql::dump class has been added in
the private repo

This reverts commit f1d22656f098d617344027f557168eb5aaf90d3c.

Change-Id: I1bc1b33926289e012db82f30ee889e1305914a18
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 48 insertions(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 3995871..1a1c62d 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -140,3 +140,43 @@
 
 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 88b8f75..71e96e0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -847,7 +847,14 @@
 include role::mariadb::tendril
 }
 
-node /^dbstore100(1|2)\.eqiad\.wmnet/ {
+node /^dbstore1001\.eqiad\.wmnet/ {
+$cluster = 'mysql'
+$mariadb_backups_folder = '/a/backups'
+include role::mariadb::dbstore
+include role::mariadb::backup
+}
+
+node /^dbstore1002\.eqiad\.wmnet/ {
 $cluster = 'mysql'
 include role::mariadb::dbstore
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/133700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bc1b33926289e012db82f30ee889e1305914a18
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Revert Revert Introduce role::mariadb::backup - change (operations/puppet)

2014-05-16 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/133700

Change subject: Revert Revert Introduce role::mariadb::backup
..

Revert Revert Introduce role::mariadb::backup

Reverting the revert. The passwords::mysql::dump class has been added in
the private repo

This reverts commit f1d22656f098d617344027f557168eb5aaf90d3c.

Change-Id: I1bc1b33926289e012db82f30ee889e1305914a18
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 48 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/133700/1

diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 3995871..1a1c62d 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -140,3 +140,43 @@
 
 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 88b8f75..71e96e0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -847,7 +847,14 @@
 include role::mariadb::tendril
 }
 
-node /^dbstore100(1|2)\.eqiad\.wmnet/ {
+node /^dbstore1001\.eqiad\.wmnet/ {
+$cluster = 'mysql'
+$mariadb_backups_folder = '/a/backups'
+include role::mariadb::dbstore
+include role::mariadb::backup
+}
+
+node /^dbstore1002\.eqiad\.wmnet/ {
 $cluster = 'mysql'
 include role::mariadb::dbstore
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/133700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bc1b33926289e012db82f30ee889e1305914a18
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits