[MediaWiki-commits] [Gerrit] vary wmerrors.ini 'fatal_log_file' per realm - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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


Change subject: vary wmerrors.ini 'fatal_log_file' per realm
......................................................................

vary wmerrors.ini 'fatal_log_file' per realm

Beta needs the PHP fatal errors to be send to a different UDP receiver
than the one used in production.  This creates a new 'configuration'
subclass to the role::applicationserver, just like what we do for
role::cache.  That let us vary the fatal_log_file.

Change-Id: I212e353b79564e2f909770b0e659414c3988aedd
---
M manifests/role/applicationserver.pp
M manifests/role/lucene.pp
2 files changed, 33 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/68831/1

diff --git a/manifests/role/applicationserver.pp 
b/manifests/role/applicationserver.pp
index 29235d2..c2a6381 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -15,6 +15,15 @@
 @monitor_group { "videoscaler_eqiad": description => "eqiad video scaler" }
 
 class role::applicationserver {
+
+       class configuration {
+               # Passed to wmerrors extension
+               $fatal_log_file = {
+                       'production' => 'udp://10.64.0.21:8420',
+                       'labs' => 'udp://10.4.0.58:8420',  # deployment-bastion
+               }
+       }
+
 # Class: role::applicationserver
 #
 # This class installs a mediawiki application server
@@ -78,8 +87,11 @@
        class webserver($maxclients="40") {
                include ::applicationserver,
                        applicationserver::pybal_check,
-                       applicationserver::syslog,
-                       applicationserver::config::php
+                       applicationserver::syslog
+
+               class { 'applicationserver::config::php':
+                       fatal_log_file => 
$role::applicationserver::configuration::fatal_log_file[$::realm]
+               }
 
                class { "applicationserver::config::apache": maxclients => 
$maxclients }
 
@@ -181,11 +193,14 @@
                        extra_args => "-v 0"
                }
 
-               include applicationserver::config::php,
-                       applicationserver::config::base,
+               include applicationserver::config::base,
                        applicationserver::packages,
                        applicationserver::cron,
                        applicationserver::sudo
+
+               class { 'applicationserver::config::php':
+                       fatal_log_file => 
$role::applicationserver::configuration::fatal_log_file[$::realm]
+               }
 
                # dependency for wikimedia-task-appserver
                service { 'apache':
@@ -200,11 +215,14 @@
                class { "role::applicationserver::common": group => "jobrunner" 
}
 
                class { "mediawiki::jobrunner": dprioprocs => 15, iprioprocs => 
6, procs_per_iobound_type => 5, run_jobs_enabled => $run_jobs_enabled }
-               include applicationserver::config::php,
-                       applicationserver::config::base,
+               include applicationserver::config::base,
                        applicationserver::packages,
                        applicationserver::cron,
                        applicationserver::sudo
+
+               class { 'applicationserver::config::php':
+                       fatal_log_file => 
$role::applicationserver::configuration::fatal_log_file[$::realm]
+               }
 
                # dependency for wikimedia-task-appserver
                        service { 'apache':
@@ -220,11 +238,14 @@
        class maintenance {
                class { "role::applicationserver::common": group => "misc" }
 
-               include applicationserver::config::php,
-                       applicationserver::config::base,
+               include applicationserver::config::base,
                        applicationserver::packages,
                        applicationserver::cron,
                        applicationserver::sudo
 
+               class { 'applicationserver::config::php':
+                       fatal_log_file => 
$role::applicationserver::configuration::fatal_log_file[$::realm]
+               }
+
        }
 }
diff --git a/manifests/role/lucene.pp b/manifests/role/lucene.pp
index d0a2d38..ad40979 100644
--- a/manifests/role/lucene.pp
+++ b/manifests/role/lucene.pp
@@ -227,13 +227,16 @@
                # Include packages needed for MW maintenance scripts
                include standard,
                        mediawiki,
-                       applicationserver::config::php,
                        applicationserver::config::base,
                        applicationserver::packages,
                        applicationserver::sudo,
                        role::lucene::admins,
                        lucene::users
 
+               class { 'applicationserver::config::php':
+                       fatal_log_file => 
$role::applicationserver::configuration::fatal_log_file[$::realm]
+               }
+
                # dependency for wikimedia-task-appserver
                service { 'apache':
                        name => "apache2",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I212e353b79564e2f909770b0e659414c3988aedd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>

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