[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdns: Remove mysql grants from non-dedicated services

2016-09-20 Thread Jcrespo (Code Review) 
Jcrespo has submitted this change and it was merged.

Change subject: labsdns: Remove mysql grants from non-dedicated services
..


labsdns: Remove mysql grants from non-dedicated services

Bug: T146146
Change-Id: I9cf74d6ae45454eb20ba4a46245b4edcc0885ee7
---
M modules/role/manifests/labs/dns.pp
1 file changed, 0 insertions(+), 4 deletions(-)

Approvals:
  Jcrespo: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/labs/dns.pp 
b/modules/role/manifests/labs/dns.pp
index c082c9b..22e8be2 100644
--- a/modules/role/manifests/labs/dns.pp
+++ b/modules/role/manifests/labs/dns.pp
@@ -15,8 +15,6 @@
 }
 
 # install mysql locally on all dns servers
-include role::mariadb::grants
-include passwords::misc::scripts
 include role::mariadb::monitor::dba
 include role::mariadb::ferm
 
@@ -33,9 +31,7 @@
 }
 
 class { 'mariadb::config':
-prompt=> 'DNS',
 config=> 'mariadb/dns.my.cnf.erb',
-password  => $passwords::misc::scripts::mysql_root_pass,
 datadir   => '/srv/sqldata',
 tmpdir=> '/srv/tmp',
 read_only => 'off',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9cf74d6ae45454eb20ba4a46245b4edcc0885ee7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdns: Remove mysql grants from non-dedicated services

2016-09-20 Thread Jcrespo (Code Review) 
Jcrespo has uploaded a new change for review.

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

Change subject: labsdns: Remove mysql grants from non-dedicated services
..

labsdns: Remove mysql grants from non-dedicated services

Bug: T146146
Change-Id: I9cf74d6ae45454eb20ba4a46245b4edcc0885ee7
---
M modules/role/manifests/labs/dns.pp
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/311768/1

diff --git a/modules/role/manifests/labs/dns.pp 
b/modules/role/manifests/labs/dns.pp
index c082c9b..22e8be2 100644
--- a/modules/role/manifests/labs/dns.pp
+++ b/modules/role/manifests/labs/dns.pp
@@ -15,8 +15,6 @@
 }
 
 # install mysql locally on all dns servers
-include role::mariadb::grants
-include passwords::misc::scripts
 include role::mariadb::monitor::dba
 include role::mariadb::ferm
 
@@ -33,9 +31,7 @@
 }
 
 class { 'mariadb::config':
-prompt=> 'DNS',
 config=> 'mariadb/dns.my.cnf.erb',
-password  => $passwords::misc::scripts::mysql_root_pass,
 datadir   => '/srv/sqldata',
 tmpdir=> '/srv/tmp',
 read_only => 'off',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cf74d6ae45454eb20ba4a46245b4edcc0885ee7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 

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