[MediaWiki-commits] [Gerrit] tools: Include labsdb aliases only in exec hosts - change (operations/puppet)

2015-05-28 Thread Yuvipanda (Code Review) 
Yuvipanda has submitted this change and it was merged.

Change subject: tools: Include labsdb aliases only in exec hosts
..


tools: Include labsdb aliases only in exec hosts

These were on the gridengine master as well and gridengine-master
falls over and dies intermittetnly if the hosts file is too big.
We only really need this on the bastions and the exec hosts,
so let's include those only there.

Bug: T100554
Change-Id: Icdb17130b7797cbf0f9f8e16aa00c395ceb0b56d
---
M manifests/role/labstools.pp
M modules/toollabs/manifests/exec_environ.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index ef3e6d7..bc2a4aa 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -5,8 +5,6 @@
 $gridmaster = "${::instanceproject}-master.${::site}.wmflabs"
 
 class { 'gridengine': gridmaster => $gridmaster }
-
-include role::labs::db::client
 }
 
 class bastion inherits role::labs::tools::common {
diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 0859ebf..f0dbb91 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -21,6 +21,8 @@
 include ::mediawiki::packages::fonts
 include ::redis::client::python
 
+include role::labs::db::client
+
 package { [
 # Please keep all packages in each group sorted in alphabetical order
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icdb17130b7797cbf0f9f8e16aa00c395ceb0b56d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tools: Include labsdb aliases only in exec hosts - change (operations/puppet)

2015-05-28 Thread Yuvipanda (Code Review) 
Yuvipanda has uploaded a new change for review.

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

Change subject: tools: Include labsdb aliases only in exec hosts
..

tools: Include labsdb aliases only in exec hosts

These were on the gridengine master as well and gridengine-master
falls over and dies intermittetnly if the hosts file is too big.
We only really need this on the bastions and the exec hosts,
so let's include those only there.

Bug: T100554
Change-Id: Icdb17130b7797cbf0f9f8e16aa00c395ceb0b56d
---
M manifests/role/labstools.pp
M modules/toollabs/manifests/exec_environ.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/214338/1

diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index ef3e6d7..bc2a4aa 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -5,8 +5,6 @@
 $gridmaster = "${::instanceproject}-master.${::site}.wmflabs"
 
 class { 'gridengine': gridmaster => $gridmaster }
-
-include role::labs::db::client
 }
 
 class bastion inherits role::labs::tools::common {
diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 0859ebf..f0dbb91 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -21,6 +21,8 @@
 include ::mediawiki::packages::fonts
 include ::redis::client::python
 
+include role::labs::db::client
+
 package { [
 # Please keep all packages in each group sorted in alphabetical order
 

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

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

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