[MediaWiki-commits] [Gerrit] cache.pp cleanup: a little formatting - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: cache.pp cleanup: a little formatting
......................................................................

cache.pp cleanup: a little formatting

Change-Id: I289bb07b370fbaaedf164c3f758a1678f6d995b5
---
M manifests/role/cache.pp
1 file changed, 16 insertions(+), 48 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/203555/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 34f39fb..0d75733 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -2,53 +2,20 @@
 # cache::varnish role classes
 
 # Virtual resources for the monitoring server
-@monitoring::group { 'cache_text_eqiad':
-    description => 'eqiad text Varnish',
-}
-@monitoring::group { 'cache_text_esams':
-    description => 'esams text Varnish',
-}
-@monitoring::group { 'cache_text_ulsfo':
-    description => 'ulsfo text Varnish',
-}
-
-@monitoring::group { 'cache_upload_eqiad':
-    description => 'eqiad upload Varnish',
-}
-@monitoring::group { 'cache_upload_esams':
-    description => 'esams upload Varnish',
-}
-@monitoring::group { 'cache_upload_ulsfo':
-    description => 'ulsfo upload Varnish',
-}
-
-@monitoring::group { 'cache_bits_eqiad':
-    description => 'eqiad bits Varnish',
-}
-@monitoring::group { 'cache_bits_esams':
-    description => 'esams bits Varnish',
-}
-@monitoring::group { 'cache_bits_ulsfo':
-    description => 'ulsfo bits Varnish',
-}
-
-@monitoring::group { 'cache_mobile_eqiad':
-    description => 'eqiad mobile Varnish',
-}
-@monitoring::group { 'cache_mobile_esams':
-    description => 'esams mobile Varnish',
-}
-@monitoring::group { 'cache_mobile_ulsfo':
-    description => 'ulsfo mobile Varnish',
-}
-
-@monitoring::group { 'cache_parsoid_eqiad':
-    description => 'Parsoid caches eqiad',
-}
-
-@monitoring::group { 'cache_misc_eqiad':
-    description => 'Misc caches eqiad',
-}
+@monitoring::group { 'cache_text_eqiad': description => 'eqiad text Varnish' }
+@monitoring::group { 'cache_text_esams': description => 'esams text Varnish' }
+@monitoring::group { 'cache_text_ulsfo': description => 'ulsfo text Varnish' }
+@monitoring::group { 'cache_upload_eqiad': description => 'eqiad upload 
Varnish' }
+@monitoring::group { 'cache_upload_esams': description => 'esams upload 
Varnish' }
+@monitoring::group { 'cache_upload_ulsfo': description => 'ulsfo upload 
Varnish' }
+@monitoring::group { 'cache_bits_eqiad': description => 'eqiad bits Varnish' }
+@monitoring::group { 'cache_bits_esams': description => 'esams bits Varnish' }
+@monitoring::group { 'cache_bits_ulsfo': description => 'ulsfo bits Varnish' }
+@monitoring::group { 'cache_mobile_eqiad': description => 'eqiad mobile 
Varnish' }
+@monitoring::group { 'cache_mobile_esams': description => 'esams mobile 
Varnish' }
+@monitoring::group { 'cache_mobile_ulsfo': description => 'ulsfo mobile 
Varnish' }
+@monitoring::group { 'cache_parsoid_eqiad': description => 'Parsoid caches 
eqiad' }
+@monitoring::group { 'cache_misc_eqiad': description => 'Misc caches eqiad' }
 
 class role::cache::configuration {
     include lvs::configuration
@@ -101,7 +68,8 @@
                 'ulsfo' => [],
             },
             'bits' => {
-                'eqiad' => ['cp1056.eqiad.wmnet',
+                'eqiad' => [
+                            'cp1056.eqiad.wmnet',
                             'cp1057.eqiad.wmnet',
                             'cp1069.eqiad.wmnet',
                             'cp1070.eqiad.wmnet',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I289bb07b370fbaaedf164c3f758a1678f6d995b5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>

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