Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365035 )
Change subject: mariadb: Add grants for rddmarc to m1
......................................................................
mariadb: Add grants for rddmarc to m1
Add user account and backups for rddmarc.
Bug: T170158
Change-Id: I87878898b24d0688cf67e6b945cab9e6fbcd9421
---
M modules/role/manifests/mariadb.pp
M modules/role/templates/mariadb/backups/dumps-misc.sh.erb
M modules/role/templates/mariadb/grants/production-m1.sql.erb
3 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Herron: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index f22bac9..f25b041 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -66,6 +66,7 @@
$striker_admin_pass = $passwords::striker::admin_db_password
$labspuppet_pass = hiera('labspuppetbackend_mysql_password')
$labsdbaccounts_pass = $passwords::labsdbaccounts::db_password
+ $rddmarc_pass = $passwords::rddmarc::db_password
file { '/etc/mysql/production-grants-shard.sql':
ensure => present,
diff --git a/modules/role/templates/mariadb/backups/dumps-misc.sh.erb
b/modules/role/templates/mariadb/backups/dumps-misc.sh.erb
index 3fc977a..1d02b65 100644
--- a/modules/role/templates/mariadb/backups/dumps-misc.sh.erb
+++ b/modules/role/templates/mariadb/backups/dumps-misc.sh.erb
@@ -5,7 +5,7 @@
my="/usr/local/bin/mysql --skip-column-names --skip-ssl"
dump="/usr/local/bin/mysqldump --single-transaction --quick --master-data=2
--skip-ssl"
-$dump -h m1-slave --databases bacula etherpadlite librenms puppet racktables
rt | \
+$dump -h m1-slave --databases bacula etherpadlite librenms puppet racktables
rt rddmarc | \
pigz > /srv/backups/m1-$(date +%Y%m%d%H%M%S).sql.gz
$dump -h m2-slave --databases iegreview reviewdb scholarships | \
diff --git a/modules/role/templates/mariadb/grants/production-m1.sql.erb
b/modules/role/templates/mariadb/grants/production-m1.sql.erb
index 29e9132..e1650df 100644
--- a/modules/role/templates/mariadb/grants/production-m1.sql.erb
+++ b/modules/role/templates/mariadb/grants/production-m1.sql.erb
@@ -112,4 +112,8 @@
SELECT, TRIGGER, UPDATE
ON `puppet`.* TO 'servermon'@'10.64.16.159';
-
+-- rddmarc
+GRANT ALTER, CREATE, SELECT, INSERT, UPDATE, DELETE
+ ON rddmarc.* TO 'rddmarc'@'208.80.153.17' IDENTIFIED BY
'<%=@rddmarc_pass%>';
+GRANT ALTER, CREATE, SELECT, INSERT, UPDATE, DELETE
+ ON rddmarc.* TO 'rddmarc'@'208.80.154.24' IDENTIFIED BY
'<%=@rddmarc_pass%>';
--
To view, visit https://gerrit.wikimedia.org/r/365035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I87878898b24d0688cf67e6b945cab9e6fbcd9421
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Herron <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Marostegui <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
