Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/325271
Change subject: Add user and passwords for labspuppet and labsdbaccounts ...................................................................... Add user and passwords for labspuppet and labsdbaccounts Bug: T152377 Change-Id: I2dcbf214550bf72543aa352abed0f8b30040fcc7 --- M modules/role/manifests/mariadb.pp M templates/mariadb/production-grants-m5.sql.erb 2 files changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/71/325271/1 diff --git a/modules/role/manifests/mariadb.pp b/modules/role/manifests/mariadb.pp index e391b6c..9472360 100644 --- a/modules/role/manifests/mariadb.pp +++ b/modules/role/manifests/mariadb.pp @@ -28,6 +28,8 @@ include passwords::prometheus include passwords::servermon include passwords::striker + include passwords::labspuppet + include passwords::labsdbaccounts $root_pass = $passwords::misc::scripts::mysql_root_pass $repl_pass = $passwords::misc::scripts::mysql_repl_pass @@ -60,6 +62,8 @@ $servermon_pass = $passwords::servermon::db_password $striker_pass = $passwords::striker::application_db_password $striker_admin_pass = $passwords::striker::admin_db_password + $labspuppet_pass = $passwords::labspuppet::db_password + $labsdbaccounts_pass = $passwords::labsdbaccounts::db_password file { '/etc/mysql/production-grants-shard.sql': ensure => present, diff --git a/templates/mariadb/production-grants-m5.sql.erb b/templates/mariadb/production-grants-m5.sql.erb index bef362d..f8947b7 100644 --- a/templates/mariadb/production-grants-m5.sql.erb +++ b/templates/mariadb/production-grants-m5.sql.erb @@ -1,6 +1,5 @@ -- haproxy CREATE USER 'haproxy'@'10.64.16.155'; -CREATE USER 'haproxy'@'10.64.48.97'; -- designate, labservices1002 @@ -140,4 +139,20 @@ -- labspuppetbackend user, will run on the labs puppetmaster host -- GRANT SELECT, INSERT, UPDATE, DELETE, ALTER -ON `labspuppet`.* TO 'labspuppet'@'208.80.154.92'; +ON `labspuppet`.* TO 'labspuppet'@'208.80.154.92' +IDENTIFIED BY '<%= @labspuppet_pass' %>'; + +GRANT SELECT, INSERT, UPDATE, DELETE, ALTER +ON `labspuppet`.* TO 'labspuppet'@'10.64.16.155' +IDENTIFIED BY '<%= @labspuppet_pass' %>'; + +-- labsdbaccounts user, will run from labstore1004 and 1005 + +GRANT ALL ON labsdbaccounts.* TO 'labsdbaccounts'@'10.64.37.19' +IDENTIFIED BY '<%= @labsdbaccounts_pass %>'; + +GRANT ALL ON labsdbaccounts.* TO 'labsdbaccounts'@'10.64.37.20' +IDENTIFIED BY '<%= @labsdbaccounts_pass %>'; + +GRANT ALL ON labsdbaccounts.* TO 'labsdbaccounts'@'10.64.16.155' +IDENTIFIED BY '<%= @labsdbaccounts_pass %>'; -- To view, visit https://gerrit.wikimedia.org/r/325271 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2dcbf214550bf72543aa352abed0f8b30040fcc7 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