Faidon Liambotis has submitted this change and it was merged.

Change subject: Fix scap firewall rules to allow connecting to mira over IPv6
......................................................................


Fix scap firewall rules to allow connecting to mira over IPv6

This was making a simple sync-file take an extra minute while waiting for the
IPv6 connection to mira time out.

Change-Id: Ib6603ed9a5d04df2d9d6bb97a6731d13b4ecb027
---
M manifests/role/deployment.pp
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index a6e0e0b..3a56004 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -62,11 +62,17 @@
     }
 
     # T115075
-    ferm::service { 'ssh_deployment_server':
+    ferm::service { 'ssh_deployment_server_ipv4':
         desc   => 'ssh on trebuchet deployment servers, for sync-file / scap',
         proto  => 'tcp',
         port   => '22',
-        srange => "@resolve((tin.eqiad.wmnet mira.codfw.wmnet))",
+        srange => "@resolve((tin.eqiad.wmnet mira.codfw.wmnet), A)",
+    }
+    ferm::service { 'ssh_deployment_server_ipv6':
+        desc   => 'ssh on trebuchet deployment servers, for sync-file / scap',
+        proto  => 'tcp',
+        port   => '22',
+        srange => "@resolve((tin.eqiad.wmnet mira.codfw.wmnet), AAAA)",
     }
 
     #T83854

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6603ed9a5d04df2d9d6bb97a6731d13b4ecb027
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to