[MediaWiki-commits] [Gerrit] drop unused 'group' param for role::applicationserver::common - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: drop unused 'group' param for role::applicationserver::common
......................................................................


drop unused 'group' param for role::applicationserver::common

The parameter doesn't do anything, and there's a TODO comment saying it should
be removed. So, removing it.

Change-Id: I72154f78b7690070c6ac07e97dbaccbcdf477361
---
M manifests/role/applicationserver.pp
1 file changed, 9 insertions(+), 12 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/applicationserver.pp 
b/manifests/role/applicationserver.pp
index 0522515..18f955e 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -34,13 +34,10 @@
 # This class installs a mediawiki application server
 #
 # Parameters:
-#   - $group:
-#     Unused at the moment, should be removed
 #   - $lvs_pool:
 #       Determines lvsrealserver IP(s) that the host will receive.
 #       From lvs::configuration::$lvs_service_ips
     class common(
-        $group, # TODO - remove this parameter as it's unused
         $lvs_pool = undef,
         ) {
 
@@ -133,7 +130,7 @@
     class appserver{
         system::role { "role::applicationserver::appserver": description => 
"Standard Apache Application server" }
 
-        class { "role::applicationserver::common": group => "appserver", 
lvs_pool => "apaches" }
+        class { "role::applicationserver::common": lvs_pool => "apaches" }
 
         if $::site == "eqiad" and $::processorcount == "16" {
             $maxclients = "60"
@@ -150,7 +147,7 @@
     class appserver::test{
         system::role { "role::applicationserver::appserver::test": description 
=> "Test Apache Application server" }
 
-        class { "role::applicationserver::common": group => "appserver", 
lvs_pool => "apaches" }
+        class { "role::applicationserver::common": lvs_pool => "apaches" }
 
         class { "role::applicationserver::webserver": maxclients => "100" }
     }
@@ -161,7 +158,7 @@
     class appserver::beta{
         system::role { "role::applicationserver::appserver::beta": description 
=> "Beta Apache Application server" }
 
-        class { "role::applicationserver::common": group => "beta_appserver" }
+        class { "role::applicationserver::common": }
 
         include ::beta::hhvm
 
@@ -184,21 +181,21 @@
     class appserver::api{
         system::role { "role::applicationserver::appserver::api": description 
=> "Api Apache Application server" }
 
-        class { "role::applicationserver::common": group => "api_appserver", 
lvs_pool => "api" }
+        class { "role::applicationserver::common": lvs_pool => "api" }
 
         class { "role::applicationserver::webserver": maxclients => "100" }
     }
     class appserver::bits{
         system::role { "role::applicationserver::appserver::bits": description 
=> "Bits Apache Application server" }
 
-        class { "role::applicationserver::common": group => "bits_appserver", 
lvs_pool => "apaches" }
+        class { "role::applicationserver::common": lvs_pool => "apaches" }
 
         class { "role::applicationserver::webserver": maxclients => "100" }
     }
     class imagescaler{
         system::role { "role::applicationserver::imagescaler": description => 
"Imagescaler Application server" }
 
-        class { "role::applicationserver::common": group => "imagescaler", 
lvs_pool => "rendering" }
+        class { "role::applicationserver::common": lvs_pool => "rendering" }
 
         class { "role::applicationserver::webserver": maxclients => "18" }
 
@@ -211,7 +208,7 @@
     class videoscaler( $run_jobs_enabled = true ){
         system::role { "role::applicationserver::videoscaler": description => 
"TMH Jobrunner Server" }
 
-        class { "role::applicationserver::common": group => "videoscaler" }
+        class { "role::applicationserver::common": }
 
         include imagescaler::cron,
             imagescaler::packages,
@@ -243,7 +240,7 @@
 
         include ::mediawiki
 
-        class { "role::applicationserver::common": group => "jobrunner" }
+        class { "role::applicationserver::common": }
 
         if $::realm == 'production' {
             class { 'mediawiki::jobrunner':
@@ -277,7 +274,7 @@
     # Maintenance servers are sometimes dual-purpose with misc apache, so the
     # apache service installed by wikimedia-task-appserver is not disabled 
here.
     class maintenance {
-        class { "role::applicationserver::common": group => "misc" }
+        class { "role::applicationserver::common": }
 
         include applicationserver::config::base,
             mediawiki::packages,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I72154f78b7690070c6ac07e97dbaccbcdf477361
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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