Yuvipanda has uploaded a new change for review.

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

Change subject: parsoid: Attempt to unify prod and beta roles
......................................................................

parsoid: Attempt to unify prod and beta roles

Bug: T86633
Change-Id: Id0e9aa4525f773d086d5f4565f8384c94e595017
---
M manifests/role/parsoid.pp
1 file changed, 12 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/193082/1

diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 2a72280..ed8d5f3 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -2,7 +2,18 @@
 
 @monitoring::group { 'parsoid_eqiad': description => 'eqiad parsoid servers' }
 
-class role::parsoid::common {
+class role::parsoid {
+    system::role { 'role::parsoid':
+        description => 'Parsoid server'
+    }
+
+    include standard
+    if $::realm != 'labs' {
+        include admin
+    }
+    include lvs::realserver
+    include base::firewall
+
     package { [
         'nodejs',
         'npm',
@@ -29,18 +40,6 @@
         proto => 'tcp',
         port  => '8000',
     }
-}
-
-class role::parsoid::production {
-    system::role { 'role::parsoid::production':
-        description => 'Parsoid server'
-    }
-
-    include role::parsoid::common
-    include standard
-    include admin
-    include lvs::realserver
-    include base::firewall
 
     package { 'parsoid/deploy':
         provider => 'trebuchet',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0e9aa4525f773d086d5f4565f8384c94e595017
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to