[MediaWiki-commits] [Gerrit] Remove mysql client from bastionhost - change (operations/puppet)

2014-05-22 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: Remove mysql client from bastionhost
..


Remove mysql client from bastionhost

Don't encourage people to use these from bastions...

- remove from bastion role
- just add it to fenari until that is gone, because
  fenari has a weird historical role

Change-Id: Ibbcfdb6eb7451ebee5598331030c333801e5b114
---
M manifests/site.pp
M modules/bastionhost/manifests/init.pp
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index a838ed0..05de20d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1066,7 +1066,7 @@
 include generic::wikidev-umask
 include misc::dsh
 include ssh::hostkeys-collect
-
+include mysql_wmf::client
 install_certificate{ 'noc.wikimedia.org': }
 }
 
diff --git a/modules/bastionhost/manifests/init.pp 
b/modules/bastionhost/manifests/init.pp
index 486b213..f837c00 100644
--- a/modules/bastionhost/manifests/init.pp
+++ b/modules/bastionhost/manifests/init.pp
@@ -2,8 +2,6 @@
 class bastionhost {
 system::role { bastionhost: description = Bastion }
 
-require mysql_wmf::client
-
 package { irssi:
 ensure = absent;
 traceroute-nanog:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbcfdb6eb7451ebee5598331030c333801e5b114
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Remove mysql client from bastionhost - change (operations/puppet)

2014-04-15 Thread Hoo man (Code Review) 
Hoo man has uploaded a new change for review.

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

Change subject: Remove mysql client from bastionhost
..

Remove mysql client from bastionhost

Don't encourage people to use these from bastions...

Change-Id: Ibbcfdb6eb7451ebee5598331030c333801e5b114
---
M modules/bastionhost/manifests/init.pp
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/126027/1

diff --git a/modules/bastionhost/manifests/init.pp 
b/modules/bastionhost/manifests/init.pp
index 7e87179..930171b 100644
--- a/modules/bastionhost/manifests/init.pp
+++ b/modules/bastionhost/manifests/init.pp
@@ -2,8 +2,6 @@
 class bastionhost {
 system::role { bastionhost: description = Bastion }
 
-require mysql_wmf::client
-
 include sudo::appserver
 
 package { irssi:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbcfdb6eb7451ebee5598331030c333801e5b114
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man h...@online.de

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