Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/310039
Change subject: Revert "contint:firewall: let phabricator talk to gearman"
......................................................................
Revert "contint:firewall: let phabricator talk to gearman"
We thought of having Phabricator on iridium to trigger CI jobs via the
Gearman protocol. It is much simpler to use the Jenkins REST API and we
have been doing that for quite a while now.
As a result, iridium.eqiad.wmnet (hosting Phabricator) no more needs to
talk to the CI master. Remove the ferm rule and related hiera key.
Impact:
contint1001.wikimedia.org
gallium.wikimedia.org
Bug: T137323
This reverts commit d6c64704088471648358050c484cc23f6999bc3d.
Change-Id: I76c579f449ad815f29f97756b3ae70f856b04249
---
M hieradata/common/contint.yaml
M modules/contint/manifests/firewall.pp
2 files changed, 0 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/310039/1
diff --git a/hieradata/common/contint.yaml b/hieradata/common/contint.yaml
index c915320..a4bef3b 100644
--- a/hieradata/common/contint.yaml
+++ b/hieradata/common/contint.yaml
@@ -3,7 +3,6 @@
# Use ip address since the value is injected in an iptables rule and ferm
# @resolve has undefined behavior.
nodepool_host: '10.64.20.18' # labnodepool1001.eqiad.wmnet
-phabricator_host: '10.64.32.150' # iridium.eqiad.wmnet
# Hosts running zuul-merger process
#
diff --git a/modules/contint/manifests/firewall.pp
b/modules/contint/manifests/firewall.pp
index 89e56b1..7fbb75a 100644
--- a/modules/contint/manifests/firewall.pp
+++ b/modules/contint/manifests/firewall.pp
@@ -35,15 +35,6 @@
port => '4730',
srange => $nodepool_host,
}
-
- # Let Phabricator talk to Gearman (T131375)
- $phabricator_host = hiera('contint::phabricator_host')
- ferm::service { 'gearman_from_phabricator':
- proto => 'tcp',
- port => '4730',
- srange => $phabricator_host,
- }
-
ferm::service { 'jenkins_zeromq_from_nodepool':
proto => 'tcp',
port => '8888',
--
To view, visit https://gerrit.wikimedia.org/r/310039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76c579f449ad815f29f97756b3ae70f856b04249
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
