Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/246207
Change subject: Use the same ferm rule for deployment hosts as we do for
mediawiki etc.
......................................................................
Use the same ferm rule for deployment hosts as we do for mediawiki etc.
Instead of building the list of deployment hosts twice again, use the existing
one.
Follow-up Ib6603ed9
Change-Id: I00751fa5ce15fa9818257f88d58a64e5ed51c668
---
M manifests/role/deployment.pp
1 file changed, 2 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/246207/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 3a56004..42d92f6 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -63,16 +63,8 @@
# T115075
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), 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)",
+ ensure => present,
+ rule => 'proto tcp dport ssh saddr $DEPLOYMENT_HOSTS ACCEPT;',
}
#T83854
--
To view, visit https://gerrit.wikimedia.org/r/246207
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00751fa5ce15fa9818257f88d58a64e5ed51c668
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
