Andrew Bogott has submitted this change and it was merged.
Change subject: Remove labspuppet user creation from
production-grants-m5.sql.erb
......................................................................
Remove labspuppet user creation from production-grants-m5.sql.erb
I can't make this work without duplicating the user password
all over the place in the private repo, which seems worse.
Change-Id: Ia0064d327fa6b8d389815cc8d65cf5fd18d52a32
---
M manifests/role/mariadb.pp
M templates/mariadb/production-grants-m5.sql.erb
2 files changed, 0 insertions(+), 4 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 54850ff..aafa9cc 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -47,7 +47,6 @@
$servermon_pass = $passwords::servermon::db_password
$striker_pass = $passwords::striker::application_db_password
$striker_admin_pass = $passwords::striker::admin_db_password
- $labspuppet_pass = hiera('labspuppetbackend::mysql_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 b143439..bef362d 100644
--- a/templates/mariadb/production-grants-m5.sql.erb
+++ b/templates/mariadb/production-grants-m5.sql.erb
@@ -139,8 +139,5 @@
-- labspuppetbackend user, will run on the labs puppetmaster host --
-CREATE USER 'labspuppet'@'208.80.154.92'
-IDENTIFIED BY '<%= @labspuppet_pass %>';
-
GRANT SELECT, INSERT, UPDATE, DELETE, ALTER
ON `labspuppet`.* TO 'labspuppet'@'208.80.154.92';
--
To view, visit https://gerrit.wikimedia.org/r/309494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0064d327fa6b8d389815cc8d65cf5fd18d52a32
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
