BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/282140
Change subject: misc VCL: disable yarn.wm.o more-completely
......................................................................
misc VCL: disable yarn.wm.o more-completely
This moves the 404 from the backend VCL to the frontend VCL and
gets rid of the now-unused backend appserver definition for
analytics1001. The driver here is it's the only oddball that
doesn't match up with plans for genericizing the backend selection
from a data structure.
Bug: T131501
Bug: T116192
Change-Id: Ic697dd3d008bd6cfb0f89a4584f5aae759afc847
---
M modules/role/manifests/cache/misc.pp
M templates/varnish/misc-backend.inc.vcl.erb
M templates/varnish/misc-frontend.inc.vcl.erb
3 files changed, 5 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/40/282140/1
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index 0355bfc..0dddbe3 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -34,12 +34,6 @@
}
$app_directors = {
- 'analytics1001' => { # Hadoop Yarn ResourceManager GUI
- 'dynamic' => 'no',
- 'type' => 'random',
- 'backends' => ['analytics1001.eqiad.wmnet'],
- 'be_opts' => merge($app_def_be_opts, { 'port' => 8088 }),
- },
'analytics1027' => { # Hue (Hadoop GUI)
'dynamic' => 'no',
'type' => 'random',
diff --git a/templates/varnish/misc-backend.inc.vcl.erb
b/templates/varnish/misc-backend.inc.vcl.erb
index 13679a4..a91f1bf 100644
--- a/templates/varnish/misc-backend.inc.vcl.erb
+++ b/templates/varnish/misc-backend.inc.vcl.erb
@@ -53,10 +53,6 @@
set req.backend = krypton;
} elsif (req.http.Host == "hue.wikimedia.org") {
set req.backend = analytics1027;
- } elsif (req.http.Host == "yarn.wikimedia.org") {
- // Disabling this as it exposes the YARN ResourceManager REST interface
- // set req.backend = analytics1001;
- error 404 "Public access disabled. See
https://wikitech.wikimedia.org/wiki/Analytics/Cluster/Access#ssh_tunnel.28s.29
for access instructions";
} elsif (req.http.Host ~ ".*\.planet\.wikimedia\.org" || req.http.Host ==
"planet.wikimedia.org") {
set req.backend = planet1001;
} elsif (req.http.Host == "etherpad.wikimedia.org") {
diff --git a/templates/varnish/misc-frontend.inc.vcl.erb
b/templates/varnish/misc-frontend.inc.vcl.erb
index 22d8a04..c98acb9 100644
--- a/templates/varnish/misc-frontend.inc.vcl.erb
+++ b/templates/varnish/misc-frontend.inc.vcl.erb
@@ -3,6 +3,11 @@
sub cluster_fe_recv_pre_purge { }
sub cluster_fe_recv {
+ if (req.http.Host == "yarn.wikimedia.org") {
+ // Disabling this as it exposes the YARN ResourceManager REST interface
+ error 404 "Public access disabled. See
https://wikitech.wikimedia.org/wiki/Analytics/Cluster/Access#ssh_tunnel.28s.29
for access instructions";
+ }
+
if (req.http.Host == "git.wikimedia.org") {
// gitblit requires the following request headers:
set req.http.X-Forwarded-Proto = "https";
--
To view, visit https://gerrit.wikimedia.org/r/282140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic697dd3d008bd6cfb0f89a4584f5aae759afc847
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
