Muehlenhoff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/366526 )

Change subject: Add cache::misc hosts to network constants
......................................................................


Add cache::misc hosts to network constants

Allows us to use ferm sranges which restrict a service served via
Varnish cache::misc (and other puppet code can use it as well of
course) to the cache hosts (generic services like NRPE or monitoring
all already covered by generic rules).

Change-Id: I41081d6b04a9f0d40983dc168a8bb9954ce0c182
---
M modules/network/manifests/constants.pp
1 file changed, 26 insertions(+), 0 deletions(-)

Approvals:
  Ema: Looks good to me, but someone else must approve
  Muehlenhoff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/network/manifests/constants.pp 
b/modules/network/manifests/constants.pp
index d7190dc..bcf710e 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -116,6 +116,32 @@
                     '10.64.53.103',                       # 
druid1003.eqiad.wmnet
                     '2620:0:861:108:1e98:ecff:fe29:e278', # 
druid1003.eqiad.wmnet
                 ],
+            'cache_misc' => [
+                    '10.64.32.97',                        # cp1045.eqiad.wmnet
+                    '2620:0:861:103:10:64:32:97',         # cp1045.eqiad.wmnet
+                    '10.64.32.103',                       # cp1051.eqiad.wmnet
+                    '2620:0:861:103:10:64:32:103',        # cp1051.eqiad.wmnet
+                    '10.64.0.95',                         # cp1058.eqiad.wmnet
+                    '2620:0:861:101:10:64:0:95',          # cp1058.eqiad.wmnet
+                    '10.64.0.98',                         # cp1061.eqiad.wmnet
+                    '2620:0:861:101:10:64:0:98',          # cp1061.eqiad.wmnet
+                    '10.192.0.127',                       # cp2006.codfw.wmnet
+                    '2620:0:860:101:10:192:0:127',        # cp2006.codfw.wmnet
+                    '10.192.16.138',                      # cp2012.codfw.wmnet
+                    '2620:0:860:102:10:192:16:138',       # cp2012.codfw.wmnet
+                    '10.192.32.117',                      # cp2018.codfw.wmnet
+                    '2620:0:860:103:10:192:32:117',       # cp2018.codfw.wmnet
+                    '10.192.48.29',                       # cp2025.codfw.wmnet
+                    '2620:0:860:104:10:192:48:29',        # cp2025.codfw.wmnet
+                    '10.20.0.107',                        # cp3007.esams.wmnet
+                    '2620:0:862:102:10:20:0:107',         # cp3007.esams.wmnet
+                    '10.20.0.108',                        # cp3008.esams.wmnet
+                    '2620:0:862:102:10:20:0:108',         # cp3008.esams.wmnet
+                    '10.20.0.109',                        # cp3009.esams.wmnet
+                    '2620:0:862:102:10:20:0:109',         # cp3009.esams.wmnet
+                    '10.20.0.110',                        # cp3010.esams.wmnet
+                    '2620:0:862:102:10:20:0:110',         # cp3010.esams.wmnet
+                ],
             },
         'labs' => {
             'bastion_hosts' => concat([

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41081d6b04a9f0d40983dc168a8bb9954ce0c182
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to