[MediaWiki-commits] [Gerrit] Cleaned up Zero regexes - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Cleaned up Zero regexes
..
Cleaned up Zero regexes
Made all Zero regexes in the same format:
^((lang|lang|lang)\.)?(m|zero)\. -- both subdomains
^((lang|lang|lang)\.)?m\. -- m only
Change-Id: If738671dc7a85ee0a361bdd219b0086cd1b6a279
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 15 insertions(+), 15 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 69abc19..574500d 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -57,13 +57,13 @@
}
} else if (req.http.X-CS2 == 623-03) {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
(^(fr|ar|sg|en|es|zh|ha|ln|eo)\.m|^m)\.) {
+ if (req.http.host ~
(^((fr|ar|sg|en|es|zh|ha|ln|eo)\.)?m\.) {
set req.http.X-CS = 623-03;
}
}
} else if (req.http.X-CS2 == 413-02) {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~ (^(en|ta|si)\.zero|^zero)\.) {
+ if (req.http.host ~ (^((en|ta|si)\.)?zero\.) {
set req.http.X-CS = 413-02;
}
}
@@ -81,13 +81,13 @@
}
} else if (req.http.X-CS2 == 470-03) {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~ (^(en|bn)\.(zero|m)|^(zero|m))\.)
{
+ if (req.http.host ~ (^((en|bn)\.)?(zero|m)\.) {
set req.http.X-CS = 470-03;
}
}
} else if (req.http.X-CS2 == 416-03) {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~ (^(en|ar)\.(zero|m)|^(zero|m))\.)
{
+ if (req.http.host ~ (^((en|ar)\.)?(zero|m)\.) {
set req.http.X-CS = 416-03;
}
}
@@ -101,7 +101,7 @@
}
} else if (req.http.X-CS2 == 624-02) {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
(^(fr|en|es|de|zh|ar|ha|ln|yo|eo)\.m|^m)\.) {
+ if (req.http.host ~
(^((fr|en|es|de|zh|ar|ha|ln|yo|eo)\.)?m\.) {
set req.http.X-CS = 624-02;
}
}
@@ -119,7 +119,7 @@
}
} else if (req.http.X-CS2 == 604-00) {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
(^(fr|ar|en|es|de|it|nl|pt|ru|zh)\.m|^m)\.) {
+ if (req.http.host ~
(^((fr|ar|en|es|de|it|nl|pt|ru|zh)\.)?m\.) {
set req.http.X-CS = 604-00;
}
}
@@ -129,19 +129,19 @@
}
} else if (req.http.X-CS2 == 605-01) {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
(^(ar|en|fr|es|de|it|ru|ja|zh)\.m|^m)\.) {
+ if (req.http.host ~
(^((ar|en|fr|es|de|it|ru|ja|zh)\.)?m\.) {
set req.http.X-CS = 605-01;
}
}
} else if (req.http.X-CS2 == 641-14) {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
(^(ko|fr|de|en|zh|sw|rw|ar|hi|es)\.m|^m)\.) {
+ if (req.http.host ~
(^((ko|fr|de|en|zh|sw|rw|ar|hi|es)\.)?m\.) {
set req.http.X-CS = 641-14;
}
}
} else if (req.http.X-CS2 == 420-01) {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
(^(ar|bn|en|tl|ur)\.(zero|m)|^(zero|m))\.) {
+ if (req.http.host ~
(^((ar|bn|en|tl|ur)\.)?(zero|m)\.) {
set req.http.X-CS = 420-01;
}
}
@@ -151,37 +151,37 @@
}
} else if (req.http.X-CS2 == 250-99) {
if (!req.http.X-Forwarded-By || req.http.X-Forwarded-By ==
Opera) {
- if (req.http.host ~ (^(en|ru)\.(zero|m)|^(zero|m))\.)
{
+ if (req.http.host ~ (^((en|ru)\.)?(zero|m)\.) {
set req.http.X-CS = 250-99;
}
}
} else if (req.http.X-CS2 == 410-01) {
if (!req.http.X-Forwarded-By || req.http.X-Forwarded-By ==
Opera) {
- if (req.http.host ~ (^(en|ur)\.(zero|m)|^(zero|m))\.)
{
+ if (req.http.host ~ (^((en|ur)\.)?(zero|m)\.) {
[MediaWiki-commits] [Gerrit] Simplify config-geo with just one text-lb resource - change (operations/dns)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102438
Change subject: Simplify config-geo with just one text-lb resource
..
Simplify config-geo with just one text-lb resource
Now that all projects point to text-lb across datacenters, there's no
reason to have separate georesources per project. Consolidate those
under a single text-lb now, simplifying our config considerably.
Change-Id: Ib83fb8cb0afed3b9bec9db0ce79852240b829575
---
M config-geo
M templates/wikimedia.org
2 files changed, 13 insertions(+), 102 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/38/102438/1
diff --git a/config-geo b/config-geo
index 3e3e2e0..d32c14a 100644
--- a/config-geo
+++ b/config-geo
@@ -244,80 +244,7 @@
ulsfo = donate-lb.ulsfo.wikimedia.org.
}
}
- # text
- foundation-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- mediawiki-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikibooks-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikimedia-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikinews-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikipedia-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikiquote-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikisource-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikiversity-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wiktionary-lb = {
+ text-lb = {
map = generic-map
dcmap = {
eqiad = text-lb.eqiad.wikimedia.org.
@@ -331,22 +258,6 @@
eqiad = mobile-lb.eqiad.wikimedia.org.
esams = mobile-lb.esams.wikimedia.org.
ulsfo = mobile-lb.ulsfo.wikimedia.org.
- }
- }
- wikidata-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
-
[MediaWiki-commits] [Gerrit] Simplify config-geo with just one text-lb resource - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Simplify config-geo with just one text-lb resource
..
Simplify config-geo with just one text-lb resource
Now that all projects point to text-lb across datacenters, there's no
reason to have separate georesources per project. Consolidate those
under a single text-lb now, simplifying our config considerably.
Change-Id: Ib83fb8cb0afed3b9bec9db0ce79852240b829575
---
M config-geo
M templates/wikimedia.org
2 files changed, 13 insertions(+), 102 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config-geo b/config-geo
index 3e3e2e0..d32c14a 100644
--- a/config-geo
+++ b/config-geo
@@ -244,80 +244,7 @@
ulsfo = donate-lb.ulsfo.wikimedia.org.
}
}
- # text
- foundation-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- mediawiki-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikibooks-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikimedia-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikinews-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikipedia-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikiquote-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikisource-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wikiversity-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
- ulsfo = text-lb.ulsfo.wikimedia.org.
- }
- }
- wiktionary-lb = {
+ text-lb = {
map = generic-map
dcmap = {
eqiad = text-lb.eqiad.wikimedia.org.
@@ -331,22 +258,6 @@
eqiad = mobile-lb.eqiad.wikimedia.org.
esams = mobile-lb.esams.wikimedia.org.
ulsfo = mobile-lb.ulsfo.wikimedia.org.
- }
- }
- wikidata-lb = {
- map = generic-map
- dcmap = {
- eqiad = text-lb.eqiad.wikimedia.org.
- esams = text-lb.esams.wikimedia.org.
-
[MediaWiki-commits] [Gerrit] Varnish misc: return pass for non-GETs - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102605
Change subject: Varnish misc: return pass for non-GETs
..
Varnish misc: return pass for non-GETs
return (pass) instead of lookup for POSTs. While at it, simplfy the
decision logic a bit, and return 404 on unknown domains.
Change-Id: Id170225dd444704f94e2979eb1183f0a28edd643
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 9 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/102605/1
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index a5a04a7..a00ceb9 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -6,17 +6,22 @@
/* gitblit requires the following request headers: */
set req.http.X-Forwarded-Proto = https;
set req.http.X-Forwarded-Port = 443;
- return (lookup);
} elsif (req.http.Host == gerrit.wikimedia.org) {
set req.backend = ytterbium;
- return (lookup);
} elsif (req.http.Host == gdash.wikimedia.org || req.http.Host ==
graphite.wikimedia.org) {
set req.backend = tungsten;
- return (lookup);
} elsif (req.http.Host == scholarships.wikimedia.org) {
set req.backend = zirconium;
- return (lookup);
+ } else {
+ error 404 Domain not served here.;
}
+
+ if (req.request != GET req.request != HEAD) {
+ /* We only deal with GET and HEAD by default */
+ return (pass);
+ }
+
+ return (lookup);
}
sub vcl_error {
--
To view, visit https://gerrit.wikimedia.org/r/102605
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id170225dd444704f94e2979eb1183f0a28edd643
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Varnish misc: return pass for non-GETs - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Varnish misc: return pass for non-GETs
..
Varnish misc: return pass for non-GETs
return (pass) instead of lookup for POSTs. While at it, simplfy the
decision logic a bit, and return 404 on unknown domains.
Change-Id: Id170225dd444704f94e2979eb1183f0a28edd643
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 9 insertions(+), 4 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index a5a04a7..9aa9a1f 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -6,17 +6,22 @@
/* gitblit requires the following request headers: */
set req.http.X-Forwarded-Proto = https;
set req.http.X-Forwarded-Port = 443;
- return (lookup);
} elsif (req.http.Host == gerrit.wikimedia.org) {
set req.backend = ytterbium;
- return (lookup);
} elsif (req.http.Host == gdash.wikimedia.org || req.http.Host ==
graphite.wikimedia.org) {
set req.backend = tungsten;
- return (lookup);
} elsif (req.http.Host == scholarships.wikimedia.org) {
set req.backend = zirconium;
- return (lookup);
+ } else {
+ error 404 Domain not served here;
}
+
+ if (req.request != GET req.request != HEAD) {
+ /* We only deal with GET and HEAD */
+ return (pass);
+ }
+
+ return (lookup);
}
sub vcl_error {
--
To view, visit https://gerrit.wikimedia.org/r/102605
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id170225dd444704f94e2979eb1183f0a28edd643
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Varnish: switch to W3C standard headers for ESI - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102633
Change subject: Varnish: switch to W3C standard headers for ESI
..
Varnish: switch to W3C standard headers for ESI
Instead of our own X-FORCE-ESI X-Enable-ESI headers, use the
standardized Surrogate-Control/Surrogate-Capability headers, as defined
in http://www.w3.org/TR/edge-arch.
The implementation is a bit naive now, not supporting section 2.3
(targeting) of the specification, which could potentially be useful in
the future for letting origin control ESI in backends as well. The
implementation is also not strictly parsing Surrogate-Control properly
nor barfing on syntax errors, but it should do it for now.
Also see the discussion on Bug #48835 about implementing the
Surrogate/1.0 protocol (part of the same specification and using the
same headers) between MediaWiki core Varnish.
Change-Id: Ib2a2b31fc3a62768588f25dfcf53b5954a80d1ba
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/102633/1
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 260e9fa..4d24112 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -82,12 +82,12 @@
% if cluster_options.fetch( enable_esi, false ) -%
if (req.http.X-CS == -TEST) {
- set req.http.X-FORCE-ESI = 1;
+ set req.http.Surrogate-Capability = frontend=ESI/1.0;
} else {
- unset req.http.X-FORCE-ESI;
+ unset req.http.Surrogate-Capability;
}
% else -%
- unset req.http.X-FORCE-ESI;
+ unset req.http.Surrogate-Capability;
% end -%
/* Default (now modified) Varnish vcl_recv function */
@@ -104,7 +104,8 @@
sub vcl_fetch {
% if cluster_options.fetch( enable_esi, false ) -%
- if (beresp.http.Enable-ESI == 1) {
+ if (beresp.http.Surrogate-Control ~ ESI/1.0) {
+ unset beresp.http.Surrogate-Control;
set beresp.do_esi = true;
}
% end -%
--
To view, visit https://gerrit.wikimedia.org/r/102633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2a2b31fc3a62768588f25dfcf53b5954a80d1ba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] reprepro: import from elasticsearch/logstash apt - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: reprepro: import from elasticsearch/logstash apt .. reprepro: import from elasticsearch/logstash apt elasticsearch.org now provides apt repositories, as of Dec 20th: http://www.elasticsearch.org/blog/apt-and-yum-repositories/ For Elasticsearch, we use their 0.90 packages anyway, so it's a no-brainer: import future versions from their apt, no functional changes. For logstash, it's a bit more complicated: the packages that we currently have in apt seem of better quality than the ones in Elasticsearch's apt repo. However, it probably makes more sense to use upstream's and file bugs with them so they can improve their official packages instead. Change-Id: I748d45df3b216f0ae38ce84a0adfe761175b3b1d --- M modules/install-server/files/reprepro-distributions M modules/install-server/files/reprepro-updates 2 files changed, 21 insertions(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, but someone else must approve Ori.livneh: Looks good to me, but someone else must approve Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/install-server/files/reprepro-distributions b/modules/install-server/files/reprepro-distributions index 2896428..73aa533 100644 --- a/modules/install-server/files/reprepro-distributions +++ b/modules/install-server/files/reprepro-distributions @@ -50,7 +50,7 @@ Architectures: source amd64 i386 Components: main universe non-free mariadb UDebComponents: main -Update: ceph jenkins cloudera hwraid cassandra +Update: ceph jenkins cloudera hwraid cassandra elasticsearch logstash Description: Wikimedia specific packages for Ubuntu Precise SignWith: default DebOverride: deb-override diff --git a/modules/install-server/files/reprepro-updates b/modules/install-server/files/reprepro-updates index 7378193..8bf757b 100644 --- a/modules/install-server/files/reprepro-updates +++ b/modules/install-server/files/reprepro-updates @@ -46,3 +46,23 @@ Architectures: amd64 source VerifyRelease: 4BD736A82B5C1B00 ListShellHook: grep-dctrl -X -S cassandra || [ $? -eq 1 ] + +Name: elasticsearch +Method: http://packages.elasticsearch.org/elasticsearch/0.90/debian +Components: mainmain +UDebComponents: +Suite: stable +GetInRelease: no +Architectures: amd64 +VerifyRelease: D27D666CD88E42B4 +ListShellHook: grep-dctrl -X -S elasticsearch || [ $? -eq 1 ] + +Name: logstash +Method: http://packages.elasticsearch.org/logstash/1.2/debian +Components: mainmain +UDebComponents: +Suite: stable +GetInRelease: no +Architectures: amd64 +VerifyRelease: D27D666CD88E42B4 +ListShellHook: grep-dctrl -X -S logstash || [ $? -eq 1 ] -- To view, visit https://gerrit.wikimedia.org/r/103112 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I748d45df3b216f0ae38ce84a0adfe761175b3b1d Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added carrier 436-04 to zero - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Added carrier 436-04 to zero
..
Added carrier 436-04 to zero
They support everything + opera, so can't use default case
Change-Id: Ifafb9a2b8f70a8b0c79facaf102745cfd5416b0c
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 82bbed2..93f68c6 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -179,6 +179,10 @@
set req.http.X-CS = 436-01;
}
}
+ } else if (req.http.X-CS2 == 436-04) {
+ if (!req.http.X-Forwarded-By || req.http.X-Forwarded-By ==
Opera) {
+ set req.http.X-CS = req.http.X-CS2;
+ }
} else if (req.http.X-CS2 == 401-01) {
if (!req.http.X-Forwarded-By) {
if (req.http.host ~ ^((ru|kk|en)\.)?(zero|m)\.) {
--
To view, visit https://gerrit.wikimedia.org/r/103198
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifafb9a2b8f70a8b0c79facaf102745cfd5416b0c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Dfoy d...@wikimedia.org
Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Zero: Keep things DRY - removed duplicate IDs - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Zero: Keep things DRY - removed duplicate IDs
..
Zero: Keep things DRY - removed duplicate IDs
In order to prevent accidental missmatch of IDs,
which could happen when copy/pasting, removed X-CS duplication.
This makes it identical to how its done in the general case at the bottom.
Change-Id: I78c56e4c0f5307365310dfa1c464c272d4adb34c
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 27 insertions(+), 27 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 93f68c6..2a49b96 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -53,130 +53,130 @@
// This is not wikipedia project - skip the rest of X-CS
identification
} else if (req.http.X-CS2 == 502-13) {
if (!req.http.X-Forwarded-By req.http.X-Subdomain == ZERO)
{
- set req.http.X-CS = 502-13;
+ set req.http.X-CS = req.http.X-CS2;
}
} else if (req.http.X-CS2 == 623-03) {
if (!req.http.X-Forwarded-By) {
if (req.http.host ~
^((fr|ar|sg|en|es|zh|ha|ln|eo)\.)?m\.) {
- set req.http.X-CS = 623-03;
+ set req.http.X-CS = req.http.X-CS2;
}
}
} else if (req.http.X-CS2 == 413-02) {
if (!req.http.X-Forwarded-By) {
if (req.http.host ~ ^((en|ta|si)\.)?zero\.) {
- set req.http.X-CS = 413-02;
+ set req.http.X-CS = req.http.X-CS2;
}
}
} else if (req.http.X-CS2 == 502-16) {
if (req.http.X-Forwarded-By == Opera req.http.X-Subdomain
== ZERO) {
- set req.http.X-CS = 502-16;
+ set req.http.X-CS = req.http.X-CS2;
}
} else if (req.http.X-CS2 == 520-18) {
if (!req.http.X-Forwarded-By req.http.X-Subdomain == ZERO)
{
- set req.http.X-CS = 520-18;
+ set req.http.X-CS = req.http.X-CS2;
}
} else if (req.http.X-CS2 == 470-01) {
if (req.http.X-Forwarded-By == Opera req.http.X-Subdomain
== ZERO) {
- set req.http.X-CS = 470-01;
+ set req.http.X-CS = req.http.X-CS2;
}
} else if (req.http.X-CS2 == 470-03) {
if (!req.http.X-Forwarded-By) {
if (req.http.host ~ ^((en|bn)\.)?(zero|m)\.) {
- set req.http.X-CS = 470-03;
+ set req.http.X-CS = req.http.X-CS2;
}
}
} else if (req.http.X-CS2 == 416-03) {
if (!req.http.X-Forwarded-By) {
if (req.http.host ~ ^((en|ar)\.)?(zero|m)\.) {
- set req.http.X-CS = 416-03;
+ set req.http.X-CS = req.http.X-CS2;
}
}
} else if (req.http.X-CS2 == 456-02) {
if (!req.http.X-Forwarded-By req.http.X-Subdomain == ZERO)
{
- set req.http.X-CS = 456-02;
+ set req.http.X-CS = req.http.X-CS2;
}
} else if (req.http.X-CS2 == 652-02) {
if ((!req.http.X-Forwarded-By || req.http.X-Forwarded-By ==
Opera) req.http.X-Subdomain == M) {
- set req.http.X-CS = 652-02;
+ set req.http.X-CS = req.http.X-CS2;
}
} else if (req.http.X-CS2 == 624-02) {
if (!req.http.X-Forwarded-By) {
if (req.http.host ~
^((fr|en|es|de|zh|ar|ha|ln|yo|eo)\.)?m\.) {
- set req.http.X-CS = 624-02;
+ set req.http.X-CS = req.http.X-CS2;
}
}
} else if (req.http.X-CS2 == 630-86) {
if (!req.http.X-Forwarded-By req.http.X-Subdomain == M) {
- set req.http.X-CS = 630-86;
+ set req.http.X-CS = req.http.X-CS2;
}
} else if (req.http.X-CS2 == 612-03) {
if ((!req.http.X-Forwarded-By || req.http.X-Forwarded-By ==
Opera) req.http.X-Subdomain == M) {
- set req.http.X-CS = 612-03;
+ set req.http.X-CS = req.http.X-CS2;
}
} else if (req.http.X-CS2 == 639-07) {
if (!req.http.X-Forwarded-By req.http.X-Subdomain == M) {
- set req.http.X-CS =
[MediaWiki-commits] [Gerrit] varnish: remove temp cache fix for zero - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: varnish: remove temp cache fix for zero
..
varnish: remove temp cache fix for zero
Change-Id: I35d71b07dae161b41c603b90bd3a5798d2c31b3f
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 0 insertions(+), 9 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 260e9fa..97fae7b 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -139,15 +139,6 @@
# unset resp.http.Enable-ESI;
unset resp.http.X-CS;
- # We used to incorrectly set them in vcl_fetch(), which means that our
- # cache is now poisoned with non-varied cached objects that have this
- # incorrectly set with random carriers. Clean up after ourselves.
- # FIXME: remove after cache expires, Sep 26 2013 + 30 days
- if (resp.http.Vary !~ X-CS resp.http.X-Analytics ~ zero=) {
- # no Vary: X-CS and zero in X-Analytics is an invalid
combination
- unset resp.http.X-Analytics;
- }
-
if (resp.http.X-Analytics) {
# do nothing, MediaWiki has handled X-Analytics
} else if (req.http.X-Analytics) {
--
To view, visit https://gerrit.wikimedia.org/r/92288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35d71b07dae161b41c603b90bd3a5798d2c31b3f
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Varnish: switch to W3C standard headers for ESI - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Varnish: switch to W3C standard headers for ESI
..
Varnish: switch to W3C standard headers for ESI
Instead of our own X-FORCE-ESI X-Enable-ESI headers, use the
standardized Surrogate-Control/Surrogate-Capability headers, as defined
in http://www.w3.org/TR/edge-arch
The implementation is a bit naive now, not supporting section 2.3
(targeting) of the specification, which could potentially be useful in
the future for letting origin control ESI in backends as well. The
implementation is also not strictly parsing Surrogate-Control properly
nor barfing on syntax errors, but it should do it for now.
Also see the discussion on Bug #48835 about implementing the
Surrogate/1.0 protocol (part of the same specification and using the
same headers) between MediaWiki core Varnish.
Change-Id: Ib2a2b31fc3a62768588f25dfcf53b5954a80d1ba
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 4 insertions(+), 6 deletions(-)
Approvals:
Yurik: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 97fae7b..f8111bd 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -80,14 +80,11 @@
set req.hash_ignore_busy = true;
+ unset req.http.Surrogate-Capability;
% if cluster_options.fetch( enable_esi, false ) -%
if (req.http.X-CS == -TEST) {
- set req.http.X-FORCE-ESI = 1;
- } else {
- unset req.http.X-FORCE-ESI;
+ set req.http.Surrogate-Capability = frontend=ESI/1.0;
}
-% else -%
- unset req.http.X-FORCE-ESI;
% end -%
/* Default (now modified) Varnish vcl_recv function */
@@ -104,10 +101,11 @@
sub vcl_fetch {
% if cluster_options.fetch( enable_esi, false ) -%
- if (beresp.http.Enable-ESI == 1) {
+ if (beresp.http.Surrogate-Control ~ ESI/1.0) {
set beresp.do_esi = true;
}
% end -%
+ unset beresp.http.Surrogate-Control;
if (req.url ~ mobileaction= || req.url ~ useformat=) {
set beresp.ttl = 60 s;
--
To view, visit https://gerrit.wikimedia.org/r/102633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2a2b31fc3a62768588f25dfcf53b5954a80d1ba
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: further cleanups to apt-repository - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/103378
Change subject: install-server: further cleanups to apt-repository
..
install-server: further cleanups to apt-repository
- remove one redundant ensure = absent File
- move to individual File resources
- group (source) files under a common directory
Change-Id: I1b154e6cf9f9f2aa79d5995ef6dc9f684a10c562
---
R modules/install-server/files/reprepro/distributions
R modules/install-server/files/reprepro/incoming
R modules/install-server/files/reprepro/log
R modules/install-server/files/reprepro/updates
M modules/install-server/manifests/apt-repository.pp
5 files changed, 39 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/103378/1
diff --git a/modules/install-server/files/reprepro-distributions
b/modules/install-server/files/reprepro/distributions
similarity index 100%
rename from modules/install-server/files/reprepro-distributions
rename to modules/install-server/files/reprepro/distributions
diff --git a/modules/install-server/files/reprepro-incoming
b/modules/install-server/files/reprepro/incoming
similarity index 100%
rename from modules/install-server/files/reprepro-incoming
rename to modules/install-server/files/reprepro/incoming
diff --git a/modules/install-server/files/reprepro-log
b/modules/install-server/files/reprepro/log
similarity index 100%
rename from modules/install-server/files/reprepro-log
rename to modules/install-server/files/reprepro/log
diff --git a/modules/install-server/files/reprepro-updates
b/modules/install-server/files/reprepro/updates
similarity index 100%
rename from modules/install-server/files/reprepro-updates
rename to modules/install-server/files/reprepro/updates
diff --git a/modules/install-server/manifests/apt-repository.pp
b/modules/install-server/manifests/apt-repository.pp
index a6e3285..d1eb351 100644
--- a/modules/install-server/manifests/apt-repository.pp
+++ b/modules/install-server/manifests/apt-repository.pp
@@ -15,58 +15,56 @@
class install-server::apt-repository {
package { [
'dpkg-dev',
+'dctrl-tools',
'gnupg',
'reprepro',
-'dctrl-tools'
]:
-ensure = latest,
+ensure = present,
}
# TODO: add something that sets up /etc/environment for reprepro
file { '/srv/wikimedia':
-ensure = directory,
-mode= '0755',
-owner = 'root',
-group = 'root';
+ensure = directory,
+mode= '0755',
+owner = 'root',
+group = 'root',
}
-# TODO: This has been long enough in deprecation, time to ensure
-# deletion, remove this resource at some later time
-file { '/usr/local/sbin/update-repository':
-ensure = absent,
+# reprepro configuration
+file { '/srv/wikimedia/conf':
+ensure = directory,
+mode= '0755',
+owner = 'root',
+group = 'root',
}
-# Reprepro configuration
-file {
-'/srv/wikimedia/conf':
-ensure = directory,
-mode= '0755',
-owner = 'root',
-group = 'root';
-'/srv/wikimedia/conf/log':
-ensure = present,
-mode= '0755',
-owner = 'root',
-group = 'root',
-source = 'puppet:///modules/install-server/reprepro-log';
-'/srv/wikimedia/conf/distributions':
-ensure = present,
-mode= '0444',
-owner = 'root',
-group = 'root',
-source =
'puppet:///modules/install-server/reprepro-distributions';
-'/srv/wikimedia/conf/updates':
-ensure = present,
-mode= '0444',
-owner = 'root',
-group = 'root',
-source = 'puppet:///modules/install-server/reprepro-updates';
-'/srv/wikimedia/conf/incoming':
-ensure = present,
-mode= '0444',
-owner = 'root',
-group = 'root',
-source = 'puppet:///modules/install-server/reprepro-incoming';
+file { '/srv/wikimedia/conf/log':
+ensure = present,
+mode= '0755',
+owner = 'root',
+group = 'root',
+source = 'puppet:///modules/install-server/reprepro/log',
+}
+file { '/srv/wikimedia/conf/distributions':
+ensure = present,
+mode= '0444',
+owner = 'root',
+group = 'root',
+source = 'puppet:///modules/install-server/reprepro/distributions',
+}
+file { '/srv/wikimedia/conf/updates':
+ensure = present,
+mode= '0444',
+owner = 'root',
+group = 'root',
+source = 'puppet:///modules/install-server/reprepro/updates',
+}
+file {
[MediaWiki-commits] [Gerrit] install-server: further cleanups to apt-repository - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: install-server: further cleanups to apt-repository
..
install-server: further cleanups to apt-repository
- remove one redundant ensure = absent File
- move to individual File resources
- group (source) files under a common directory
- change to ensure = present from latest
Change-Id: I1b154e6cf9f9f2aa79d5995ef6dc9f684a10c562
---
R modules/install-server/files/reprepro/distributions
R modules/install-server/files/reprepro/incoming
R modules/install-server/files/reprepro/log
R modules/install-server/files/reprepro/updates
M modules/install-server/manifests/apt-repository.pp
5 files changed, 39 insertions(+), 41 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/modules/install-server/files/reprepro-distributions
b/modules/install-server/files/reprepro/distributions
similarity index 100%
rename from modules/install-server/files/reprepro-distributions
rename to modules/install-server/files/reprepro/distributions
diff --git a/modules/install-server/files/reprepro-incoming
b/modules/install-server/files/reprepro/incoming
similarity index 100%
rename from modules/install-server/files/reprepro-incoming
rename to modules/install-server/files/reprepro/incoming
diff --git a/modules/install-server/files/reprepro-log
b/modules/install-server/files/reprepro/log
similarity index 100%
rename from modules/install-server/files/reprepro-log
rename to modules/install-server/files/reprepro/log
diff --git a/modules/install-server/files/reprepro-updates
b/modules/install-server/files/reprepro/updates
similarity index 100%
rename from modules/install-server/files/reprepro-updates
rename to modules/install-server/files/reprepro/updates
diff --git a/modules/install-server/manifests/apt-repository.pp
b/modules/install-server/manifests/apt-repository.pp
index a6e3285..d1eb351 100644
--- a/modules/install-server/manifests/apt-repository.pp
+++ b/modules/install-server/manifests/apt-repository.pp
@@ -15,58 +15,56 @@
class install-server::apt-repository {
package { [
'dpkg-dev',
+'dctrl-tools',
'gnupg',
'reprepro',
-'dctrl-tools'
]:
-ensure = latest,
+ensure = present,
}
# TODO: add something that sets up /etc/environment for reprepro
file { '/srv/wikimedia':
-ensure = directory,
-mode= '0755',
-owner = 'root',
-group = 'root';
+ensure = directory,
+mode= '0755',
+owner = 'root',
+group = 'root',
}
-# TODO: This has been long enough in deprecation, time to ensure
-# deletion, remove this resource at some later time
-file { '/usr/local/sbin/update-repository':
-ensure = absent,
+# reprepro configuration
+file { '/srv/wikimedia/conf':
+ensure = directory,
+mode= '0755',
+owner = 'root',
+group = 'root',
}
-# Reprepro configuration
-file {
-'/srv/wikimedia/conf':
-ensure = directory,
-mode= '0755',
-owner = 'root',
-group = 'root';
-'/srv/wikimedia/conf/log':
-ensure = present,
-mode= '0755',
-owner = 'root',
-group = 'root',
-source = 'puppet:///modules/install-server/reprepro-log';
-'/srv/wikimedia/conf/distributions':
-ensure = present,
-mode= '0444',
-owner = 'root',
-group = 'root',
-source =
'puppet:///modules/install-server/reprepro-distributions';
-'/srv/wikimedia/conf/updates':
-ensure = present,
-mode= '0444',
-owner = 'root',
-group = 'root',
-source = 'puppet:///modules/install-server/reprepro-updates';
-'/srv/wikimedia/conf/incoming':
-ensure = present,
-mode= '0444',
-owner = 'root',
-group = 'root',
-source = 'puppet:///modules/install-server/reprepro-incoming';
+file { '/srv/wikimedia/conf/log':
+ensure = present,
+mode= '0755',
+owner = 'root',
+group = 'root',
+source = 'puppet:///modules/install-server/reprepro/log',
+}
+file { '/srv/wikimedia/conf/distributions':
+ensure = present,
+mode= '0444',
+owner = 'root',
+group = 'root',
+source = 'puppet:///modules/install-server/reprepro/distributions',
+}
+file { '/srv/wikimedia/conf/updates':
+ensure = present,
+mode= '0444',
+owner = 'root',
+group = 'root',
+source = 'puppet:///modules/install-server/reprepro/updates',
+}
+file {
[MediaWiki-commits] [Gerrit] varnish: adjust first_byte_timeout for mobile too - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: varnish: adjust first_byte_timeout for mobile too
..
varnish: adjust first_byte_timeout for mobile too
Bring mobile varnish TTFB timeouts to parity with their desktop
equivalents, as previously fixed with
Ic14902d399712a1eb0d2d98ce5f505e6740ef68b.
Bug: 57249
Change-Id: I6896b6863668641061ffa1174eae7f36f3d71544
---
M manifests/role/cache.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 8934297..565f28a 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1010,7 +1010,7 @@
{
'port' = 80,
'connect_timeout' = 5s,
-'first_byte_timeout' = 35s,
+'first_byte_timeout' = 180s,
'between_bytes_timeout' = 4s,
'max_connections' = 600,
}],
@@ -1044,7 +1044,7 @@
'port' = 3128,
'weight' = $backend_weight,
'connect_timeout' = 5s,
-'first_byte_timeout' = 35s,
+'first_byte_timeout' = 185s,
'between_bytes_timeout' = 2s,
'max_connections' = 10,
'probe' = varnish,
--
To view, visit https://gerrit.wikimedia.org/r/103376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6896b6863668641061ffa1174eae7f36f3d71544
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Jhall jh...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add nuria to sudoers on vanadium - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Add nuria to sudoers on vanadium
..
Add nuria to sudoers on vanadium
Rolling out breaking changes to EventLogging code can require starting /
stopping
EventLogging services, viewing log files in /var/log/upstart, binding to
privleged ports, etc.
Change-Id: I1ac96c38492c007ada8ceb7bfc2f385784c38401
---
M manifests/site.pp
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 6d06360..4a62032 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2528,8 +2528,8 @@
# Receives log data from varnishes (udp 8422) and Apaches (udp 8421),
# processes it, and broadcasts to internal subscribers.
-node vanadium.eqiad.wmnet {
-$gid=500
+node 'vanadium.eqiad.wmnet' {
+$gid = 500
include standard,
role::eventlogging,
@@ -2537,6 +2537,10 @@
role::logging::mediawiki::errors,
groups::wikidev,
accounts::nuria # RT 6535
+
+sudo_user { 'nuria':
+privileges = ['ALL = NOPASSWD: ALL'],
+}
}
# Hosts visualization / monitoring of EventLogging event streams
--
To view, visit https://gerrit.wikimedia.org/r/103397
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ac96c38492c007ada8ceb7bfc2f385784c38401
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Added carrier 436-04 to zero - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Revert Added carrier 436-04 to zero
..
Revert Added carrier 436-04 to zero
If we knew what wouldn't work, we wouldn't call it testing.
This reverts commit c993792edd19cdd902c4f1c3e2f396f0f25c2c5b.
Change-Id: Iebc08afa9edf40c7897dc1092f3a2064d8345197
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 2a49b96..5695f29 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -179,10 +179,6 @@
set req.http.X-CS = req.http.X-CS2;
}
}
- } else if (req.http.X-CS2 == 436-04) {
- if (!req.http.X-Forwarded-By || req.http.X-Forwarded-By ==
Opera) {
- set req.http.X-CS = req.http.X-CS2;
- }
} else if (req.http.X-CS2 == 401-01) {
if (!req.http.X-Forwarded-By) {
if (req.http.host ~ ^((ru|kk|en)\.)?(zero|m)\.) {
--
To view, visit https://gerrit.wikimedia.org/r/103526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iebc08afa9edf40c7897dc1092f3a2064d8345197
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Yurik yu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dhcp: virt1001 is .eqiad.wmnet not .wikimedia.org - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: dhcp: virt1001 is .eqiad.wmnet not .wikimedia.org
..
dhcp: virt1001 is .eqiad.wmnet not .wikimedia.org
Change-Id: I5e26eaeb907d126dd47de9fd40b688cf96afc586
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
index b9ce6a7..fb81017 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -86,7 +86,7 @@
host virt1001 {
hardware ethernet 88:43:e1:c2:99:8e;
- fixed-address virt1001.wikimedia.org;
+ fixed-address virt1001.eqiad.wmnet;
}
host virt1002 {
--
To view, visit https://gerrit.wikimedia.org/r/103568
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e26eaeb907d126dd47de9fd40b688cf96afc586
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dhcp: virt1001 is .eqiad.wmnet not .wikimedia.org - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/103568
Change subject: dhcp: virt1001 is .eqiad.wmnet not .wikimedia.org
..
dhcp: virt1001 is .eqiad.wmnet not .wikimedia.org
Change-Id: I5e26eaeb907d126dd47de9fd40b688cf96afc586
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/103568/1
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
index b9ce6a7..fb81017 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -86,7 +86,7 @@
host virt1001 {
hardware ethernet 88:43:e1:c2:99:8e;
- fixed-address virt1001.wikimedia.org;
+ fixed-address virt1001.eqiad.wmnet;
}
host virt1002 {
--
To view, visit https://gerrit.wikimedia.org/r/103568
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e26eaeb907d126dd47de9fd40b688cf96afc586
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reenable LVS paging check for ms-fe.eqiad.wmnet - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91090
Change subject: Reenable LVS paging check for ms-fe.eqiad.wmnet
..
Reenable LVS paging check for ms-fe.eqiad.wmnet
Swift @ eqiad is production now (MediaWiki writes to it), so let's
enable paging.
Change-Id: Ib6696f25dd3011182ff4790dadaa4f1f5b752285
---
M manifests/lvs.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/90/91090/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 9a47720..0fae503 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -1097,7 +1097,7 @@
monitor_service_lvs_http { rendering.svc.pmtpa.wmnet: ip_address =
10.2.1.21, check_command = check_http_lvs!en.wikipedia.org!/wiki/Main_Page
}
monitor_service_lvs_http { rendering.svc.eqiad.wmnet: ip_address =
10.2.2.21, check_command = check_http_lvs!en.wikipedia.org!/wiki/Main_Page
}
monitor_service_lvs_http { ms-fe.pmtpa.wmnet: ip_address =
10.2.1.27, check_command =
check_http_lvs!ms-fe.pmtpa.wmnet!/monitoring/backend }
-# monitor_service_lvs_http { ms-fe.eqiad.wmnet: ip_address =
10.2.2.27, check_command =
check_http_lvs!ms-fe.eqiad.wmnet!/monitoring/backend }
+ monitor_service_lvs_http { ms-fe.eqiad.wmnet: ip_address =
10.2.2.27, check_command =
check_http_lvs!ms-fe.eqiad.wmnet!/monitoring/backend }
monitor_service_lvs_http { parsoid.svc.eqiad.wmnet: ip_address =
10.2.2.28, check_command = check_http_on_port!8000, contact_group =
admins,parsoid }
monitor_service_lvs_http { parsoidcache.svc.eqiad.wmnet: ip_address
= 10.2.2.29, check_command = check_http_lvs!parsoid!/, contact_group =
admins,parsoid }
monitor_service_lvs_http { search.svc.eqiad.wmnet: ip_address =
10.2.2.30, check_command = check_http_on_port!9200, contact_group =
admins }
--
To view, visit https://gerrit.wikimedia.org/r/91090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6696f25dd3011182ff4790dadaa4f1f5b752285
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reenable LVS paging check for ms-fe.eqiad.wmnet - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Reenable LVS paging check for ms-fe.eqiad.wmnet
..
Reenable LVS paging check for ms-fe.eqiad.wmnet
Swift @ eqiad is production now (MediaWiki writes to it), so let's
enable paging.
Change-Id: Ib6696f25dd3011182ff4790dadaa4f1f5b752285
---
M manifests/lvs.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 9a47720..0fae503 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -1097,7 +1097,7 @@
monitor_service_lvs_http { rendering.svc.pmtpa.wmnet: ip_address =
10.2.1.21, check_command = check_http_lvs!en.wikipedia.org!/wiki/Main_Page
}
monitor_service_lvs_http { rendering.svc.eqiad.wmnet: ip_address =
10.2.2.21, check_command = check_http_lvs!en.wikipedia.org!/wiki/Main_Page
}
monitor_service_lvs_http { ms-fe.pmtpa.wmnet: ip_address =
10.2.1.27, check_command =
check_http_lvs!ms-fe.pmtpa.wmnet!/monitoring/backend }
-# monitor_service_lvs_http { ms-fe.eqiad.wmnet: ip_address =
10.2.2.27, check_command =
check_http_lvs!ms-fe.eqiad.wmnet!/monitoring/backend }
+ monitor_service_lvs_http { ms-fe.eqiad.wmnet: ip_address =
10.2.2.27, check_command =
check_http_lvs!ms-fe.eqiad.wmnet!/monitoring/backend }
monitor_service_lvs_http { parsoid.svc.eqiad.wmnet: ip_address =
10.2.2.28, check_command = check_http_on_port!8000, contact_group =
admins,parsoid }
monitor_service_lvs_http { parsoidcache.svc.eqiad.wmnet: ip_address
= 10.2.2.29, check_command = check_http_lvs!parsoid!/, contact_group =
admins,parsoid }
monitor_service_lvs_http { search.svc.eqiad.wmnet: ip_address =
10.2.2.30, check_command = check_http_on_port!9200, contact_group =
admins }
--
To view, visit https://gerrit.wikimedia.org/r/91090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6696f25dd3011182ff4790dadaa4f1f5b752285
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apt: import Cassandra from ASF - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/91322 Change subject: apt: import Cassandra from ASF .. apt: import Cassandra from ASF Add the Apache Foundation apt repository as an external source for Cassandra for our apt repository. Pin to their v2.x section for now. Change-Id: I1552c68cb4cbf6e3e0bcd7c6f93c07ca3ecedc4e --- M files/misc/reprepro/distributions M files/misc/reprepro/updates 2 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/22/91322/1 diff --git a/files/misc/reprepro/distributions b/files/misc/reprepro/distributions index 1559a71..2896428 100644 --- a/files/misc/reprepro/distributions +++ b/files/misc/reprepro/distributions @@ -50,7 +50,7 @@ Architectures: source amd64 i386 Components: main universe non-free mariadb UDebComponents: main -Update: ceph jenkins cloudera hwraid +Update: ceph jenkins cloudera hwraid cassandra Description: Wikimedia specific packages for Ubuntu Precise SignWith: default DebOverride: deb-override diff --git a/files/misc/reprepro/updates b/files/misc/reprepro/updates index fc63b2f..7378193 100644 --- a/files/misc/reprepro/updates +++ b/files/misc/reprepro/updates @@ -37,3 +37,12 @@ Architectures: amd64 source VerifyRelease: 6005210E23B3D3B4 ListShellHook: grep-dctrl -X -S megacli -o -X -P arcconf || [ $? -eq 1 ] + +Name: cassandra +Method: http://www.apache.org/dist/cassandra/debian +Components: mainmain +UDebComponents: +Suite: 20x +Architectures: amd64 source +VerifyRelease: 4BD736A82B5C1B00 +ListShellHook: grep-dctrl -X -S cassandra || [ $? -eq 1 ] -- To view, visit https://gerrit.wikimedia.org/r/91322 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1552c68cb4cbf6e3e0bcd7c6f93c07ca3ecedc4e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apt: import Cassandra from ASF - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: apt: import Cassandra from ASF .. apt: import Cassandra from ASF Add the Apache Foundation apt repository as an external source for Cassandra for our apt repository. Pin to their v2.x section for now. Change-Id: I1552c68cb4cbf6e3e0bcd7c6f93c07ca3ecedc4e --- M files/misc/reprepro/distributions M files/misc/reprepro/updates 2 files changed, 10 insertions(+), 1 deletion(-) Approvals: Faidon Liambotis: Looks good to me, approved GWicke: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/files/misc/reprepro/distributions b/files/misc/reprepro/distributions index 1559a71..2896428 100644 --- a/files/misc/reprepro/distributions +++ b/files/misc/reprepro/distributions @@ -50,7 +50,7 @@ Architectures: source amd64 i386 Components: main universe non-free mariadb UDebComponents: main -Update: ceph jenkins cloudera hwraid +Update: ceph jenkins cloudera hwraid cassandra Description: Wikimedia specific packages for Ubuntu Precise SignWith: default DebOverride: deb-override diff --git a/files/misc/reprepro/updates b/files/misc/reprepro/updates index fc63b2f..7378193 100644 --- a/files/misc/reprepro/updates +++ b/files/misc/reprepro/updates @@ -37,3 +37,12 @@ Architectures: amd64 source VerifyRelease: 6005210E23B3D3B4 ListShellHook: grep-dctrl -X -S megacli -o -X -P arcconf || [ $? -eq 1 ] + +Name: cassandra +Method: http://www.apache.org/dist/cassandra/debian +Components: mainmain +UDebComponents: +Suite: 20x +Architectures: amd64 source +VerifyRelease: 4BD736A82B5C1B00 +ListShellHook: grep-dctrl -X -S cassandra || [ $? -eq 1 ] -- To view, visit https://gerrit.wikimedia.org/r/91322 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1552c68cb4cbf6e3e0bcd7c6f93c07ca3ecedc4e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: GWicke gwi...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cassandra: add sysctl.d tunable - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91326
Change subject: cassandra: add sysctl.d tunable
..
cassandra: add sysctl.d tunable
The Cassandra packages ship a sysctl file setting vm.max_map_count. We
do recurse = true, purge = true for /etc/sysctl.d so we clean these
up. Reinstate the setting by explicitly using sysctl::parameters for
this.
(this is currently being done via a very hackish manner out of site.pp;
this is temporary until Cassandra gets a puppet class)
Change-Id: I96d1c6d53dd8fc3fe9f493233d5c026ef146e4d1
---
M manifests/site.pp
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/91326/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 83864be..257e361 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -307,6 +307,13 @@
sudo_user { 'gwicke':
privileges = ['ALL = (ALL) NOPASSWD: ALL'],
}
+
+# XXX: to be moved into the puppet class
+sysctl::parameters { 'cassandra':
+values = {
+'vm.max_map_count' = 1048575,
+},
+}
}
node /^(chromium|hydrogen)\.wikimedia\.org$/ {
--
To view, visit https://gerrit.wikimedia.org/r/91326
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96d1c6d53dd8fc3fe9f493233d5c026ef146e4d1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cassandra: add sysctl.d tunable - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: cassandra: add sysctl.d tunable
..
cassandra: add sysctl.d tunable
The Cassandra packages ship a sysctl file setting vm.max_map_count. We
do recurse = true, purge = true for /etc/sysctl.d so we clean these
up. Reinstate the setting by explicitly using sysctl::parameters for
this.
(this is currently being done via a very hackish manner out of site.pp;
this is temporary until Cassandra gets a puppet class)
Change-Id: I96d1c6d53dd8fc3fe9f493233d5c026ef146e4d1
---
M manifests/site.pp
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 83864be..257e361 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -307,6 +307,13 @@
sudo_user { 'gwicke':
privileges = ['ALL = (ALL) NOPASSWD: ALL'],
}
+
+# XXX: to be moved into the puppet class
+sysctl::parameters { 'cassandra':
+values = {
+'vm.max_map_count' = 1048575,
+},
+}
}
node /^(chromium|hydrogen)\.wikimedia\.org$/ {
--
To view, visit https://gerrit.wikimedia.org/r/91326
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96d1c6d53dd8fc3fe9f493233d5c026ef146e4d1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apache-fast-test: add API appservers to the list - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91374
Change subject: apache-fast-test: add API appservers to the list
..
apache-fast-test: add API appservers to the list
Change-Id: Ibeff988fc8dd7b56eb57aff563a87436504a32ec
---
M files/misc/scripts/apache-fast-test
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/74/91374/1
diff --git a/files/misc/scripts/apache-fast-test
b/files/misc/scripts/apache-fast-test
index 79e81e0..36bb6b4 100755
--- a/files/misc/scripts/apache-fast-test
+++ b/files/misc/scripts/apache-fast-test
@@ -44,6 +44,7 @@
# list of production servers from pybal config
$servers = get_server_list_from_pybal_config(qw(
/home/w/conf/pybal/eqiad/apaches
+ /home/w/conf/pybal/eqiad/api
));
} elsif (/^([\w\.]+)$/) {
$servers-{$1} = 1;
--
To view, visit https://gerrit.wikimedia.org/r/91374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibeff988fc8dd7b56eb57aff563a87436504a32ec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apache-fast-test: add API appservers to the list - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: apache-fast-test: add API appservers to the list
..
apache-fast-test: add API appservers to the list
Change-Id: Ibeff988fc8dd7b56eb57aff563a87436504a32ec
---
M files/misc/scripts/apache-fast-test
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/scripts/apache-fast-test
b/files/misc/scripts/apache-fast-test
index 79e81e0..36bb6b4 100755
--- a/files/misc/scripts/apache-fast-test
+++ b/files/misc/scripts/apache-fast-test
@@ -44,6 +44,7 @@
# list of production servers from pybal config
$servers = get_server_list_from_pybal_config(qw(
/home/w/conf/pybal/eqiad/apaches
+ /home/w/conf/pybal/eqiad/api
));
} elsif (/^([\w\.]+)$/) {
$servers-{$1} = 1;
--
To view, visit https://gerrit.wikimedia.org/r/91374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibeff988fc8dd7b56eb57aff563a87436504a32ec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mobile views to ganglia - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Add mobile views to ganglia
..
Add mobile views to ganglia
Change-Id: I560fe931f5cb2bc056df27982c01839b770ae695
---
M manifests/misc/monitoring.pp
1 file changed, 22 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index 0ffbb1c..aa1e89d 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -332,6 +332,28 @@
}
+# == Class: misc::monitoring::view::mobile
+#
+# Performance measurements from Mobile Web.
+#
+class misc::monitoring::view::mobile {
+ ganglia::view { 'Mobile Web':
+ graphs = [
+ {
+ title= 'Mobile Web: pageSpeed
(domInteractive to loadEventEnd) and rendering (responseEnd to loadEventEnd)',
+ host_regex = 'client-side',
+ metric_regex =
'^browser.(rendering|pageSpeed).mobile_median$',
+ },
+ {
+ title= 'Mobile Web: receiving
(responseStart to responseEnd)',
+ host_regex = 'client-side',
+ metric_regex =
'^browser.receiving.mobile_median$',
+ },
+ ],
+ }
+}
+
+
# == Class: misc::monitoring::view::bits_ttfb
#
# A Ganglia view of TTFB (time to first byte) timing data obtained via
--
To view, visit https://gerrit.wikimedia.org/r/91079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I560fe931f5cb2bc056df27982c01839b770ae695
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gallium: let ci folks sudo as jenkins-slave - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: gallium: let ci folks sudo as jenkins-slave
..
gallium: let ci folks sudo as jenkins-slave
The Jenkins jobs used to run as jenkins. They are now run as a
separate user (jenkins-slave) in order to let CI folks debug things and
run maintenance scripts, need similar rights to be able to interact with
the Jenkins slave files on gallium.
Change-Id: I60c7761c6b49dc946ff3bdce3c02261a1b70c90c
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 68b587b..bceab0f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1059,6 +1059,7 @@
$gid=500
sudo_user { [ demon, krinkle, reedy, dsc, mholmquist ]:
privileges = [
'ALL = (jenkins) NOPASSWD: ALL'
+,'ALL = (jenkins-slave) NOPASSWD: ALL'
,'ALL = (gerritslave) NOPASSWD: ALL'
,'ALL = NOPASSWD: /etc/init.d/jenkins'
,'ALL = (testswarm) NOPASSWD: ALL'
--
To view, visit https://gerrit.wikimedia.org/r/92431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I60c7761c6b49dc946ff3bdce3c02261a1b70c90c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] icinga: capitalize Faidon's name remove Asher - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/104957 Change subject: icinga: capitalize Faidon's name remove Asher .. icinga: capitalize Faidon's name remove Asher I use the capitalized form of my name to login, and while Apache mod auth LDAP happily accepts it, Icinga was less happy to. Switch the config to that. Also while at it, remove Asher from the config, per his remove access request. Change-Id: Ib264b57f68e2cd247324d2f32e139cdd9ba79cfa --- M files/icinga/cgi.cfg 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/57/104957/1 diff --git a/files/icinga/cgi.cfg b/files/icinga/cgi.cfg index 2a93ee6..becb750 100644 --- a/files/icinga/cgi.cfg +++ b/files/icinga/cgi.cfg @@ -131,7 +131,7 @@ # not use authorization. You may use an asterisk (*) to # authorize any user who has authenticated to the web server. -authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott # CONFIGURATION INFORMATION ACCESS @@ -142,7 +142,7 @@ # an asterisk (*) to authorize any user who has authenticated # to the web server. -authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott @@ -155,7 +155,7 @@ # You may use an asterisk (*) to authorize any user who has # authenticated to the web server. -authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott # GLOBAL HOST/SERVICE VIEW ACCESS @@ -181,8 +181,8 @@ # authorization). You may use an asterisk (*) to authorize any # user who has authenticated to the web server. -authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott -authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott -- To view, visit https://gerrit.wikimedia.org/r/104957 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib264b57f68e2cd247324d2f32e139cdd9ba79cfa Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] icinga: capitalize Faidon's name remove Asher - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: icinga: capitalize Faidon's name remove Asher .. icinga: capitalize Faidon's name remove Asher I use the capitalized form of my name to login, and while Apache mod auth LDAP happily accepts it, Icinga was less happy to. Switch the config to that. Also while at it, remove Asher from the config, per his remove access request. Change-Id: Ib264b57f68e2cd247324d2f32e139cdd9ba79cfa --- M files/icinga/cgi.cfg 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/files/icinga/cgi.cfg b/files/icinga/cgi.cfg index 2a93ee6..becb750 100644 --- a/files/icinga/cgi.cfg +++ b/files/icinga/cgi.cfg @@ -131,7 +131,7 @@ # not use authorization. You may use an asterisk (*) to # authorize any user who has authenticated to the web server. -authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott # CONFIGURATION INFORMATION ACCESS @@ -142,7 +142,7 @@ # an asterisk (*) to authorize any user who has authenticated # to the web server. -authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott @@ -155,7 +155,7 @@ # You may use an asterisk (*) to authorize any user who has # authenticated to the web server. -authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott # GLOBAL HOST/SERVICE VIEW ACCESS @@ -181,8 +181,8 @@ # authorization). You may use an asterisk (*) to authorize any # user who has authenticated to the web server. -authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott -authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,asher,arielglenn,cmjohnson,dzahn,lcarr,jgreen,faidon liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,lcarr,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott -- To view, visit https://gerrit.wikimedia.org/r/104957 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib264b57f68e2cd247324d2f32e139cdd9ba79cfa Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Point graphite CNAME at tungsten in eqiad - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged. Change subject: Point graphite CNAME at tungsten in eqiad .. Point graphite CNAME at tungsten in eqiad * tungsten is the new Graphite host in eqiad, replacing professor in pmtpa. * Set graphite CNAME TTL to 600 * Drop gdash and graphite wmnet CNAMEs. Change-Id: If02fec8505389fc6a23cd5c79f39d63fd892c669 --- M templates/wikimedia.org M templates/wmnet 2 files changed, 1 insertion(+), 3 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/templates/wikimedia.org b/templates/wikimedia.org index d05eff3..8910f8e 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -482,6 +482,7 @@ 1H IN 2620:0:861:3:208:80:154:81 git1H IN CNAMEmisc-web-lb.eqiad gdash 1H IN CNAMEmisc-web-lb.eqiad +graphite 600 IN CNAMEmisc-web-lb.eqiad icinga 1H IN CNAMEneon icinga-admin 1H IN A208.80.154.14 @@ -629,7 +630,6 @@ fundraising1H IN CNAMEaluminium ganglia1H IN CNAMEnickel globalblog 1H IN CNAMEholmium.wikimedia.org. -graphite 1H IN CNAMEnoc ishmael1H IN CNAMEneon jobs 1H IN CNAMEwikimedia-lb labs 1H IN CNAMEwikimedia-lb diff --git a/templates/wmnet b/templates/wmnet index e7cc1c8..9aaec94 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -35,8 +35,6 @@ dbdump 1H IN A10.0.5.1 dns-r0 1H IN A10.0.5.6 dns-r1 1H IN A10.0.5.7 -graphite 1H IN CNAMEprofessor.pmtpa.wmnet. -gdash 1H IN CNAMEprofessor.pmtpa.wmnet. nfs-home 1H IN A10.0.5.8 imagedump 1H IN A10.0.5.2 rendering.svc 1H IN A10.2.1.21 -- To view, visit https://gerrit.wikimedia.org/r/105166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If02fec8505389fc6a23cd5c79f39d63fd892c669 Gerrit-PatchSet: 3 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move sqstat (udp2log to carbon) to tungsten - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/105230 Change subject: Move sqstat (udp2log to carbon) to tungsten .. Move sqstat (udp2log to carbon) to tungsten tungsten is the new carbon box. Change-Id: I7efc9cb41bee3d4f90d3bfc05bf491094e2bb230 --- M files/udp2log/sqstat.pl 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/30/105230/1 diff --git a/files/udp2log/sqstat.pl b/files/udp2log/sqstat.pl index 58f7570..a7ee73f 100755 --- a/files/udp2log/sqstat.pl +++ b/files/udp2log/sqstat.pl @@ -42,7 +42,7 @@ $0 = /usr/local/bin/sqstat; -my $carbon_server = 10.0.6.30; +my $carbon_server = tungsten.eqiad.wmnet; my $carbon_port = 2003; my $carbon = IO::Socket::INET-new( PeerAddr = $carbon_server, -- To view, visit https://gerrit.wikimedia.org/r/105230 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7efc9cb41bee3d4f90d3bfc05bf491094e2bb230 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move sqstat (udp2log to carbon) to tungsten - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Move sqstat (udp2log to carbon) to tungsten .. Move sqstat (udp2log to carbon) to tungsten tungsten is the new carbon box. Change-Id: I7efc9cb41bee3d4f90d3bfc05bf491094e2bb230 --- M files/udp2log/sqstat.pl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/files/udp2log/sqstat.pl b/files/udp2log/sqstat.pl index 58f7570..a7ee73f 100755 --- a/files/udp2log/sqstat.pl +++ b/files/udp2log/sqstat.pl @@ -42,7 +42,7 @@ $0 = /usr/local/bin/sqstat; -my $carbon_server = 10.0.6.30; +my $carbon_server = tungsten.eqiad.wmnet; my $carbon_port = 2003; my $carbon = IO::Socket::INET-new( PeerAddr = $carbon_server, -- To view, visit https://gerrit.wikimedia.org/r/105230 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7efc9cb41bee3d4f90d3bfc05bf491094e2bb230 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix gdash reqstats dashboards - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/105232 Change subject: Fix gdash reqstats dashboards .. Fix gdash reqstats dashboards reqstats aren't under MediaWiki.*, because they're not generated by MediaWiki but rather from sqstat.pl. Partially revert If9a3810. Change-Id: I5cb93a594e61cce17740a39cbe75134bffd50efd --- M files/graphite/gdash/dashboards/editswiki/1.1.edits-enwp.graph M files/graphite/gdash/dashboards/editswiki/1.2.edits-enwp-1day.graph M files/graphite/gdash/dashboards/editswiki/1.3.edits-enwp-1week.graph M files/graphite/gdash/dashboards/editswiki/2.0.edits-noen.graph M files/graphite/gdash/dashboards/editswiki/2.1.submits-noen.graph M files/graphite/gdash/dashboards/editswiki/2.4.submits-nowp.graph M files/graphite/gdash/dashboards/editswiki/4.submits-hr-week-noen.graph M files/graphite/gdash/dashboards/editswiki/5.edits.enwp-tp50.graph M files/graphite/gdash/dashboards/editswiki/6.edits.enwp-tp99.graph M files/graphite/gdash/dashboards/editswiki/7.edits.enwp-tp50-day.graph M files/graphite/gdash/dashboards/editswiki/8.edits.enwp-tp99-day.graph M files/graphite/gdash/dashboards/reqerror/1.5xx.graph M files/graphite/gdash/dashboards/reqerror/10.4xx-1y.graph M files/graphite/gdash/dashboards/reqerror/2.4xx.graph M files/graphite/gdash/dashboards/reqerror/3.5xx-sum-1day.graph M files/graphite/gdash/dashboards/reqerror/4.4xx-sum-1day.graph M files/graphite/gdash/dashboards/reqerror/5.5xx-1wk.graph M files/graphite/gdash/dashboards/reqerror/6.4xx.graph M files/graphite/gdash/dashboards/reqerror/7.5xx-2m.graph M files/graphite/gdash/dashboards/reqerror/8.4xx-2m.graph M files/graphite/gdash/dashboards/reqerror/9.5xx-1y.graph M files/graphite/gdash/dashboards/reqmobile/1.0.pageviews-8hr.graph M files/graphite/gdash/dashboards/reqmobile/1.1.pageviews-top-8hr.graph M files/graphite/gdash/dashboards/reqmobile/1.2.en.m.time.graph M files/graphite/gdash/dashboards/reqmobile/2.0.pageviews-8hr.graph M files/graphite/gdash/dashboards/reqmobile/2.1.pageviews-top-8hr.graph M files/graphite/gdash/dashboards/reqmobile/2.2.en.m.time.graph M files/graphite/gdash/dashboards/reqmobile/3.0.1.pageviews-8hr.graph M files/graphite/gdash/dashboards/reqmobile/3.0.pageviews-8hr.graph M files/graphite/gdash/dashboards/reqmobile/3.1.pageviews-top-8hr.graph M files/graphite/gdash/dashboards/reqmobile/3.2.en.m.time.graph M files/graphite/gdash/dashboards/reqsum/0.pageview-forecast.graph M files/graphite/gdash/dashboards/reqsum/1.pageviews.graph M files/graphite/gdash/dashboards/reqsum/2.0.reqs.graph M files/graphite/gdash/dashboards/reqsum/2.1.pageviews-1day.graph M files/graphite/gdash/dashboards/reqsum/2.1.reqs-1day.graph M files/graphite/gdash/dashboards/reqsum/2.2.pageviews-1week.graph M files/graphite/gdash/dashboards/reqsum/3.2.reqs-1week.graph M files/graphite/gdash/dashboards/reqsum/5.0.mobile.graph M files/graphite/gdash/dashboards/reqsum/5.1.mobile-1day.graph M files/graphite/gdash/dashboards/reqsum/5.2.mobile-1week.graph M files/graphite/gdash/dashboards/reqwiki/1.pageviews-enwp.graph M files/graphite/gdash/dashboards/reqwiki/2.pageviews.graph M files/graphite/gdash/dashboards/reqwiki/3.enwiki-tp50.graph M files/graphite/gdash/dashboards/reqwiki/4.0.pageviews-enwp-1day.graph M files/graphite/gdash/dashboards/reqwiki/4.1.pageviews-1d.graph M files/graphite/gdash/dashboards/reqwiki/4.2.enwiki-tp50-1d.graph M files/graphite/gdash/dashboards/reqwiki/5.1.pageviews-enwp-1wk.graph M files/graphite/gdash/dashboards/reqwiki/5.2.pageviews-1wk.graph M files/graphite/gdash/dashboards/reqwiki/5.3.enwiki-tp50-1wk.graph 50 files changed, 66 insertions(+), 66 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/32/105232/1 diff --git a/files/graphite/gdash/dashboards/editswiki/1.1.edits-enwp.graph b/files/graphite/gdash/dashboards/editswiki/1.1.edits-enwp.graph index c88376b..a737b03 100644 --- a/files/graphite/gdash/dashboards/editswiki/1.1.edits-enwp.graph +++ b/files/graphite/gdash/dashboards/editswiki/1.1.edits-enwp.graph @@ -6,8 +6,8 @@ field :a, :color = blue, :alias = none, - :data = 'cactiStyle(alias(MediaWiki.reqstatsedits.en_wikipedia_org.edit,edit requests/min))' + :data = 'cactiStyle(alias(reqstats.edits.en_wikipedia_org.edit,edit requests/min))' field :b, :color = red, :alias = none, - :data = 'cactiStyle(alias(MediaWiki.reqstatsedits.en_wikipedia_org.submits,edit submits/min))' + :data = 'cactiStyle(alias(reqstats.edits.en_wikipedia_org.submits,edit submits/min))' diff --git a/files/graphite/gdash/dashboards/editswiki/1.2.edits-enwp-1day.graph b/files/graphite/gdash/dashboards/editswiki/1.2.edits-enwp-1day.graph index e650631..3b07b50 100644 --- a/files/graphite/gdash/dashboards/editswiki/1.2.edits-enwp-1day.graph +++
[MediaWiki-commits] [Gerrit] gdash: fix owner/group/mode for templates - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105237
Change subject: gdash: fix owner/group/mode for templates
..
gdash: fix owner/group/mode for templates
Having our gdash dashboards owned by e.g. gmetric or having random
permissions is probably not the best idea :)
Change-Id: I9d8eda7793db4274537ff7a6d743454ad8a8e717
---
M modules/gdash/manifests/init.pp
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/105237/1
diff --git a/modules/gdash/manifests/init.pp b/modules/gdash/manifests/init.pp
index 811def3..b1a9a16 100644
--- a/modules/gdash/manifests/init.pp
+++ b/modules/gdash/manifests/init.pp
@@ -66,6 +66,9 @@
file { $template_dir:
ensure = directory,
+owner = root,
+group = root,
+mode= '0444',
purge = true,
recurse = true,
force = true,
--
To view, visit https://gerrit.wikimedia.org/r/105237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d8eda7793db4274537ff7a6d743454ad8a8e717
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gdash: fix owner/group/mode for templates - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: gdash: fix owner/group/mode for templates
..
gdash: fix owner/group/mode for templates
Having our gdash dashboards owned by e.g. gmetric or having random
permissions is probably not the best idea :)
Change-Id: I9d8eda7793db4274537ff7a6d743454ad8a8e717
---
M modules/gdash/manifests/init.pp
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/gdash/manifests/init.pp b/modules/gdash/manifests/init.pp
index 811def3..b1a9a16 100644
--- a/modules/gdash/manifests/init.pp
+++ b/modules/gdash/manifests/init.pp
@@ -66,6 +66,9 @@
file { $template_dir:
ensure = directory,
+owner = root,
+group = root,
+mode= '0444',
purge = true,
recurse = true,
force = true,
--
To view, visit https://gerrit.wikimedia.org/r/105237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d8eda7793db4274537ff7a6d743454ad8a8e717
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] graphite: use the correct port for carbonlink - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/105250 Change subject: graphite: use the correct port for carbonlink .. graphite: use the correct port for carbonlink Use carbon's cache_query_port in graphite-web's carbonlink, not the pickle_receiver_port. Change-Id: Id83efec885d25f10e16f3dc64407894cf3968254 --- M manifests/role/graphite.pp 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/50/105250/1 diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp index b7b9297..f7b897f 100644 --- a/manifests/role/graphite.pp +++ b/manifests/role/graphite.pp @@ -83,10 +83,10 @@ pickle_receiver_interface = '0.0.0.0', relay_method = 'consistent-hashing', destinations = [ -'127.0.0.1:2104:a', -'127.0.0.1:2204:b', -'127.0.0.1:2304:c', -'127.0.0.1:2404:d', +'127.0.0.1:7102:a', +'127.0.0.1:7202:b', +'127.0.0.1:7302:c', +'127.0.0.1:7402:d', ], }, }, -- To view, visit https://gerrit.wikimedia.org/r/105250 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id83efec885d25f10e16f3dc64407894cf3968254 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] graphite: use both virt0/virt1000 for AuthLDAPURL - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105381
Change subject: graphite: use both virt0/virt1000 for AuthLDAPURL
..
graphite: use both virt0/virt1000 for AuthLDAPURL
virt1000 seems to be down atm, so authentication fails and 500s are
being thrown. We should use both, as this is the only way we provide
redundancy so far.
Change-Id: Id461df5c32e6959e781324b1f713b6b2ef4f0100
---
M templates/graphite/graphite.apache.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/105381/1
diff --git a/templates/graphite/graphite.apache.erb
b/templates/graphite/graphite.apache.erb
index 008719b..ff16c3f 100644
--- a/templates/graphite/graphite.apache.erb
+++ b/templates/graphite/graphite.apache.erb
@@ -14,7 +14,7 @@
AuthBasicProvider ldap
AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
AuthLDAPBindPassword %=
scope.lookupvar('::passwords::ldap::production::proxypass') %
-AuthLDAPURL
ldaps://virt1000.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn
+AuthLDAPURL ldaps://virt0.wikimedia.org
virt1000.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn
Require ldap-group cn=wmf,ou=groups,dc=wikimedia,dc=org
# uWSGI reverse-proxy
--
To view, visit https://gerrit.wikimedia.org/r/105381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id461df5c32e6959e781324b1f713b6b2ef4f0100
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] graphite: use both virt0/virt1000 for AuthLDAPURL - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: graphite: use both virt0/virt1000 for AuthLDAPURL
..
graphite: use both virt0/virt1000 for AuthLDAPURL
virt1000 seems to be down atm, so authentication fails and 500s are
being thrown. We should use both, as this is the only way we provide
redundancy so far.
Change-Id: Id461df5c32e6959e781324b1f713b6b2ef4f0100
---
M templates/graphite/graphite.apache.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/templates/graphite/graphite.apache.erb
b/templates/graphite/graphite.apache.erb
index 008719b..ff16c3f 100644
--- a/templates/graphite/graphite.apache.erb
+++ b/templates/graphite/graphite.apache.erb
@@ -14,7 +14,7 @@
AuthBasicProvider ldap
AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
AuthLDAPBindPassword %=
scope.lookupvar('::passwords::ldap::production::proxypass') %
-AuthLDAPURL
ldaps://virt1000.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn
+AuthLDAPURL ldaps://virt0.wikimedia.org
virt1000.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn
Require ldap-group cn=wmf,ou=groups,dc=wikimedia,dc=org
# uWSGI reverse-proxy
--
To view, visit https://gerrit.wikimedia.org/r/105381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id461df5c32e6959e781324b1f713b6b2ef4f0100
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add carbon-relay statsd service aliases - change (operations/dns)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/105383 Change subject: Add carbon-relay statsd service aliases .. Add carbon-relay statsd service aliases To be used instead of hardcoding tungsten everywhere professor was hardcoded. Change-Id: I0a3bf99674a1a8e834926b61825ab49fd8bf7d26 --- M templates/wmnet 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/83/105383/1 diff --git a/templates/wmnet b/templates/wmnet index 36d78b5..dad776f 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -29,6 +29,8 @@ mirror 1H IN CNAMEapt.wikimedia.org. smtp 1H IN CNAMEwiki-mail.wikimedia.org. webproxy 1H IN CNAMEbrewster.wikimedia.org. +carbon-relay 1H IN CNAMEtungsten.eqiad.wmnet. +statsd 1H IN CNAMEtungsten.eqiad.wmnet. apaches1H IN A10.2.1.1 apaches2 1H IN A10.0.5.5 @@ -700,6 +702,8 @@ ntp1H IN CNAMElinne.wikimedia.org. syslog 1H IN CNAMEnfs-home.pmtpa.wmnet. webproxy 1H IN CNAMEcarbon.wikimedia.org. +carbon-relay 1H IN CNAMEtungsten.eqiad.wmnet. +statsd 1H IN CNAMEtungsten.eqiad.wmnet. s1-master 5M IN CNAMEdb1056.eqiad.wmnet. s2-master 5M IN CNAMEdb1036.eqiad.wmnet. s3-master 5M IN CNAMEdb1038.eqiad.wmnet. -- To view, visit https://gerrit.wikimedia.org/r/105383 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a3bf99674a1a8e834926b61825ab49fd8bf7d26 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] graphite-web: Specify instance names in CARBONLINK_HOSTS - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: graphite-web: Specify instance names in CARBONLINK_HOSTS
..
graphite-web: Specify instance names in CARBONLINK_HOSTS
Corrects Id83efec88.
Change-Id: Id4180b5b9d772e70fa97f2117ad717945911fd7a
---
M modules/graphite/templates/local_settings.py.erb
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/modules/graphite/templates/local_settings.py.erb
b/modules/graphite/templates/local_settings.py.erb
index 9747896..fcf8412 100644
--- a/modules/graphite/templates/local_settings.py.erb
+++ b/modules/graphite/templates/local_settings.py.erb
@@ -49,9 +49,9 @@
%- carbon_settings = scope.lookupvar('::graphite::carbon_settings'); if
carbon_settings.key? 'relay' -%
CARBONLINK_HOSTS = [%=
carbon_settings['relay']['destinations'].map { |dest|
-host, pickle_receiver_port, name = dest.split(':')
-cache_query_port = carbon_settings[cache:#{name}]['cache_query_port']
-\#{host}:#{cache_query_port}\
+server, pickle_receiver_port, instance = dest.split(':')
+cache_query_port =
carbon_settings[cache:#{instance}]['cache_query_port']
+\#{server}:#{cache_query_port}:#{instance}\
}.join(', ')
%]
%- end -%
--
To view, visit https://gerrit.wikimedia.org/r/105385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4180b5b9d772e70fa97f2117ad717945911fd7a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gdash dashboards: s/white/black/ - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/105392 Change subject: gdash dashboards: s/white/black/ .. gdash dashboards: s/white/black/ Now that the graphs have a white background, using white to display lines isn't very... effective. Switch to black, which should do it. This currently only affects the pageview forecast graph. Change-Id: Icbe7d0e453afc7ae5e3659343aa76bce644183c9 --- M files/graphite/gdash/dashboards/reqsum/0.pageview-forecast.graph 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/92/105392/1 diff --git a/files/graphite/gdash/dashboards/reqsum/0.pageview-forecast.graph b/files/graphite/gdash/dashboards/reqsum/0.pageview-forecast.graph index da02650..11ae43f 100644 --- a/files/graphite/gdash/dashboards/reqsum/0.pageview-forecast.graph +++ b/files/graphite/gdash/dashboards/reqsum/0.pageview-forecast.graph @@ -7,6 +7,6 @@ forecast :reqs, :data = 'reqstats.pageviews', :alias = pageview/min, :forecast_color = green, - :bands_color = white, + :bands_color = black, :color = blue -- To view, visit https://gerrit.wikimedia.org/r/105392 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icbe7d0e453afc7ae5e3659343aa76bce644183c9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gdash dashboards: s/white/black/ - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: gdash dashboards: s/white/black/ .. gdash dashboards: s/white/black/ Now that the graphs have a white background, using white to display lines isn't very... effective. Switch to black, which should do it. This currently only affects the pageview forecast graph. Change-Id: Icbe7d0e453afc7ae5e3659343aa76bce644183c9 --- M files/graphite/gdash/dashboards/reqsum/0.pageview-forecast.graph 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/files/graphite/gdash/dashboards/reqsum/0.pageview-forecast.graph b/files/graphite/gdash/dashboards/reqsum/0.pageview-forecast.graph index da02650..11ae43f 100644 --- a/files/graphite/gdash/dashboards/reqsum/0.pageview-forecast.graph +++ b/files/graphite/gdash/dashboards/reqsum/0.pageview-forecast.graph @@ -7,6 +7,6 @@ forecast :reqs, :data = 'reqstats.pageviews', :alias = pageview/min, :forecast_color = green, - :bands_color = white, + :bands_color = black, :color = blue -- To view, visit https://gerrit.wikimedia.org/r/105392 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbe7d0e453afc7ae5e3659343aa76bce644183c9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] graphite: enable carbon over UDP - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: graphite: enable carbon over UDP
..
graphite: enable carbon over UDP
We actually use UDP from sqstat, so enable this and restore service for
reqstats statistics, graphs alerts.
Change-Id: Ic8e66f071fa8e6d2e582f9ee106859fb10e2d37a
---
M manifests/role/graphite.pp
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index b7b9297..6757dcd 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -81,6 +81,8 @@
'relay' = {
line_receiver_interface = '0.0.0.0',
pickle_receiver_interface = '0.0.0.0',
+udp_receiver_interface= '0.0.0.0',
+enable_udp_listener = 'true',
relay_method = 'consistent-hashing',
destinations = [
'127.0.0.1:2104:a',
--
To view, visit https://gerrit.wikimedia.org/r/105419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8e66f071fa8e6d2e582f9ee106859fb10e2d37a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] graphite: enable carbon over UDP - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105419
Change subject: graphite: enable carbon over UDP
..
graphite: enable carbon over UDP
We actually use UDP from sqstat, so enable this and restore service for
reqstats statistics, graphs alerts.
Change-Id: Ic8e66f071fa8e6d2e582f9ee106859fb10e2d37a
---
M manifests/role/graphite.pp
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/105419/1
diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index b7b9297..6757dcd 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -81,6 +81,8 @@
'relay' = {
line_receiver_interface = '0.0.0.0',
pickle_receiver_interface = '0.0.0.0',
+udp_receiver_interface= '0.0.0.0',
+enable_udp_listener = 'true',
relay_method = 'consistent-hashing',
destinations = [
'127.0.0.1:2104:a',
--
To view, visit https://gerrit.wikimedia.org/r/105419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8e66f071fa8e6d2e582f9ee106859fb10e2d37a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] refreshDomainRedirects: exit(1) on error - change (operations/apache-config)
Faidon Liambotis has submitted this change and it was merged.
Change subject: refreshDomainRedirects: exit(1) on error
..
refreshDomainRedirects: exit(1) on error
Whenever using refreshDomainRedirects in a script or chained with other
commands, it is helpful to have it throw a non-zero exit code. Example
usage:
$ ./refreshDomainRedirects git diff
Change-Id: Iff927cd29861b484469193b52668f482470d1d2e
---
M refreshDomainRedirects
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/refreshDomainRedirects b/refreshDomainRedirects
index 408e2c2..67adabe 100755
--- a/refreshDomainRedirects
+++ b/refreshDomainRedirects
@@ -465,4 +465,5 @@
if ( $parser $parser-getLine( $e-lineNum ) ) {
print {$e-lineNum}: . $parser-getLine( $e-lineNum ) .
\n;
}
+ exit(1);
}
--
To view, visit https://gerrit.wikimedia.org/r/106312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff927cd29861b484469193b52668f482470d1d2e
Gerrit-PatchSet: 2
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Jeremyb jer...@tuxmachine.com
Gerrit-Reviewer: Lcarr lc...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: RobH r...@wikimedia.org
Gerrit-Reviewer: Tim Starling tstarl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deployment: switch carbon host to tungsten - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/106438
Change subject: deployment: switch carbon host to tungsten
..
deployment: switch carbon host to tungsten
Graphite has been moved to tungsten, switch the (newly renamed) puppet
variable from professor to tungsten and restore the show code deploys
Graphite feature that got broken during the transition.
Change-Id: I9ef9d6e9228e9e00a633c98e582b5ccb4f6c9186
---
M manifests/misc/deployment.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/106438/1
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index e162968..bfe31f7 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -371,7 +371,7 @@
if $::realm == 'production' {
$mw_rsync_host = 'tin.eqiad.wmnet'
- $mw_carbon_host = 'professor.pmtpa.wmnet'
+ $mw_carbon_host = 'tungsten.eqiad.wmnet'
$mw_carbon_port = 2003
file { $mw_common_source:
--
To view, visit https://gerrit.wikimedia.org/r/106438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ef9d6e9228e9e00a633c98e582b5ccb4f6c9186
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deployment: s/mw_statsd/mw_carbon/ - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/106437
Change subject: deployment: s/mw_statsd/mw_carbon/
..
deployment: s/mw_statsd/mw_carbon/
Port 2003 is actually Carbon, not statsd, so stop lying and name the
$mw_statsd_{host,port} MW_STATSD_{HOST,PORT} variables accordingly.
Change-Id: Iec7f90c11e18a8b5c41e004fa6676a58d6d164cf
---
M files/misc/scripts/deploy2graphite
M manifests/misc/deployment.pp
M templates/misc/mw-deployment-vars.erb
3 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/106437/1
diff --git a/files/misc/scripts/deploy2graphite
b/files/misc/scripts/deploy2graphite
index d6add57..322c5df 100755
--- a/files/misc/scripts/deploy2graphite
+++ b/files/misc/scripts/deploy2graphite
@@ -9,7 +9,7 @@
echo Expected deploy events include sync-common, sync-file, scap,
etc.
echo These messages can be suppressed by setting an environment
variable $DOLOGMSGNOLOG.
echo
- echo IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP. Go ask Asher why.
:)
+ echo IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP.
echo
exit
}
@@ -19,9 +19,9 @@
if [ -z $DOLOGMSGNOLOG ]; then
if [ $1 ] ; then
utime=$(date +%s)
- echo deploy.$1 1 $utime | nc -w1 -q0 $MW_STATSD_HOST
$MW_STATSD_PORT || /bin/true
- echo deploy.any 1 $utime | nc -w1 -q0 $MW_STATSD_HOST
$MW_STATSD_PORT || /bin/true
- test -n $2 echo deploy.${1}.timing:${2}000|ms | nc -w1
-q0 $MW_STATSD_HOST $MW_STATSD_PORT || /bin/true
+ echo deploy.$1 1 $utime | nc -w1 -q0 $MW_CARBON_HOST
$MW_CARBON_PORT || /bin/true
+ echo deploy.any 1 $utime | nc -w1 -q0 $MW_CARBON_HOST
$MW_CARBON_PORT || /bin/true
+ test -n $2 echo deploy.${1}.timing:${2}000|ms | nc -w1
-q0 $MW_CARBON_HOST $MW_CARBON_PORT || /bin/true
else
usage
fi
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 797e74f..e162968 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -371,8 +371,8 @@
if $::realm == 'production' {
$mw_rsync_host = 'tin.eqiad.wmnet'
- $mw_statsd_host = 'professor.pmtpa.wmnet'
- $mw_statsd_port = 2003
+ $mw_carbon_host = 'professor.pmtpa.wmnet'
+ $mw_carbon_port = 2003
file { $mw_common_source:
ensure = directory,
@@ -384,8 +384,8 @@
} else {
$mw_rsync_host = 'deployment-bastion.pmtpa.wmflabs'
- $mw_statsd_host = 'deployment-bastion.pmtpa.wmflabs'
- $mw_statsd_port = 2003
+ $mw_carbon_host = 'deployment-bastion.pmtpa.wmflabs'
+ $mw_carbon_port = 2003
# The Apache directories must belong to the mwdeploy user known on
# deployment-bastion.pmtpa.wmflabs. That is the instance used by
diff --git a/templates/misc/mw-deployment-vars.erb
b/templates/misc/mw-deployment-vars.erb
index 904cf65..99c07ac 100644
--- a/templates/misc/mw-deployment-vars.erb
+++ b/templates/misc/mw-deployment-vars.erb
@@ -6,5 +6,5 @@
MW_RSYNC_HOST=%= mw_rsync_host %
MW_DSH_ARGS=('-cM' '-g' 'mediawiki-installation' '-o' '-oSetupTimeout=30'
'-F30')
MW_RSYNC_ARGS=('-a' '--delete-delay' '--delay-updates' '--compress' '--delete'
'--exclude=**/.svn/lock' '--exclude=**/.git/objects'
'--exclude=**/.git/**/objects' '--exclude=**/cache/l10n/*.cdb' '--no-perms')
-MW_STATSD_HOST=%= mw_statsd_host %
-MW_STATSD_PORT=%= mw_statsd_port %
+MW_CARBON_HOST=%= mw_carbon_host %
+MW_CARBON_PORT=%= mw_carbon_port %
--
To view, visit https://gerrit.wikimedia.org/r/106437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec7f90c11e18a8b5c41e004fa6676a58d6d164cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deployment: s/mw_statsd/mw_carbon/ - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: deployment: s/mw_statsd/mw_carbon/
..
deployment: s/mw_statsd/mw_carbon/
Port 2003 is actually Carbon, not statsd, so stop lying and name the
$mw_statsd_{host,port} MW_STATSD_{HOST,PORT} variables accordingly.
Change-Id: Iec7f90c11e18a8b5c41e004fa6676a58d6d164cf
---
M files/misc/scripts/deploy2graphite
M manifests/misc/deployment.pp
M templates/misc/mw-deployment-vars.erb
3 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/scripts/deploy2graphite
b/files/misc/scripts/deploy2graphite
index d6add57..322c5df 100755
--- a/files/misc/scripts/deploy2graphite
+++ b/files/misc/scripts/deploy2graphite
@@ -9,7 +9,7 @@
echo Expected deploy events include sync-common, sync-file, scap,
etc.
echo These messages can be suppressed by setting an environment
variable $DOLOGMSGNOLOG.
echo
- echo IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP. Go ask Asher why.
:)
+ echo IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP.
echo
exit
}
@@ -19,9 +19,9 @@
if [ -z $DOLOGMSGNOLOG ]; then
if [ $1 ] ; then
utime=$(date +%s)
- echo deploy.$1 1 $utime | nc -w1 -q0 $MW_STATSD_HOST
$MW_STATSD_PORT || /bin/true
- echo deploy.any 1 $utime | nc -w1 -q0 $MW_STATSD_HOST
$MW_STATSD_PORT || /bin/true
- test -n $2 echo deploy.${1}.timing:${2}000|ms | nc -w1
-q0 $MW_STATSD_HOST $MW_STATSD_PORT || /bin/true
+ echo deploy.$1 1 $utime | nc -w1 -q0 $MW_CARBON_HOST
$MW_CARBON_PORT || /bin/true
+ echo deploy.any 1 $utime | nc -w1 -q0 $MW_CARBON_HOST
$MW_CARBON_PORT || /bin/true
+ test -n $2 echo deploy.${1}.timing:${2}000|ms | nc -w1
-q0 $MW_CARBON_HOST $MW_CARBON_PORT || /bin/true
else
usage
fi
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 797e74f..e162968 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -371,8 +371,8 @@
if $::realm == 'production' {
$mw_rsync_host = 'tin.eqiad.wmnet'
- $mw_statsd_host = 'professor.pmtpa.wmnet'
- $mw_statsd_port = 2003
+ $mw_carbon_host = 'professor.pmtpa.wmnet'
+ $mw_carbon_port = 2003
file { $mw_common_source:
ensure = directory,
@@ -384,8 +384,8 @@
} else {
$mw_rsync_host = 'deployment-bastion.pmtpa.wmflabs'
- $mw_statsd_host = 'deployment-bastion.pmtpa.wmflabs'
- $mw_statsd_port = 2003
+ $mw_carbon_host = 'deployment-bastion.pmtpa.wmflabs'
+ $mw_carbon_port = 2003
# The Apache directories must belong to the mwdeploy user known on
# deployment-bastion.pmtpa.wmflabs. That is the instance used by
diff --git a/templates/misc/mw-deployment-vars.erb
b/templates/misc/mw-deployment-vars.erb
index 904cf65..99c07ac 100644
--- a/templates/misc/mw-deployment-vars.erb
+++ b/templates/misc/mw-deployment-vars.erb
@@ -6,5 +6,5 @@
MW_RSYNC_HOST=%= mw_rsync_host %
MW_DSH_ARGS=('-cM' '-g' 'mediawiki-installation' '-o' '-oSetupTimeout=30'
'-F30')
MW_RSYNC_ARGS=('-a' '--delete-delay' '--delay-updates' '--compress' '--delete'
'--exclude=**/.svn/lock' '--exclude=**/.git/objects'
'--exclude=**/.git/**/objects' '--exclude=**/cache/l10n/*.cdb' '--no-perms')
-MW_STATSD_HOST=%= mw_statsd_host %
-MW_STATSD_PORT=%= mw_statsd_port %
+MW_CARBON_HOST=%= mw_carbon_host %
+MW_CARBON_PORT=%= mw_carbon_port %
--
To view, visit https://gerrit.wikimedia.org/r/106437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iec7f90c11e18a8b5c41e004fa6676a58d6d164cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deployment: switch carbon host to tungsten - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: deployment: switch carbon host to tungsten
..
deployment: switch carbon host to tungsten
Graphite has been moved to tungsten, switch the (newly renamed) puppet
variable from professor to tungsten and restore the show code deploys
Graphite feature that got broken during the transition.
Change-Id: I9ef9d6e9228e9e00a633c98e582b5ccb4f6c9186
---
M manifests/misc/deployment.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index e162968..bfe31f7 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -371,7 +371,7 @@
if $::realm == 'production' {
$mw_rsync_host = 'tin.eqiad.wmnet'
- $mw_carbon_host = 'professor.pmtpa.wmnet'
+ $mw_carbon_host = 'tungsten.eqiad.wmnet'
$mw_carbon_port = 2003
file { $mw_common_source:
--
To view, visit https://gerrit.wikimedia.org/r/106438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ef9d6e9228e9e00a633c98e582b5ccb4f6c9186
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gdash: fix code deploy colors for white background - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/106440
Change subject: gdash: fix code deploy colors for white background
..
gdash: fix code deploy colors for white background
White on white doesn't work so well, and grey on white doesn't work
either. Switch scaps to black and sync-common-file to dashed gold
instead to match the continuous gold for sync-common-all.
It remains to be seen whether gold is a good color for displaying on a
white background.
Change-Id: I3833f390598342dd3d8f82878f25227395ffdb86
---
M templates/gdash/deploy_addon.erb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/40/106440/1
diff --git a/templates/gdash/deploy_addon.erb b/templates/gdash/deploy_addon.erb
index ed3..e1bd32d 100644
--- a/templates/gdash/deploy_addon.erb
+++ b/templates/gdash/deploy_addon.erb
@@ -6,13 +6,13 @@
[
# sync-common-file
-
'alias(color(dashed(drawAsInfinite(deploy.sync-common-file)),c0c0c080),sync-common-file)',
+
'alias(color(dashed(drawAsInfinite(deploy.sync-common-file)),gold),sync-common-file)',
# sync-common-all
'alias(color(lineWidth(drawAsInfinite(deploy.sync-common-all),2),gold),sync-common-all)',
# scap
-'alias(color(lineWidth(drawAsInfinite(deploy.scap),2),white),scap
deploy)',
+'alias(color(lineWidth(drawAsInfinite(deploy.scap),2),black),scap
deploy)',
].join('')
%
--
To view, visit https://gerrit.wikimedia.org/r/106440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3833f390598342dd3d8f82878f25227395ffdb86
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] noc: remove ishmael cleanup - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/106455
Change subject: noc: remove ishmael cleanup
..
noc: remove ishmael cleanup
ishmael has been moved into a module, a role class and a different box
(neon) for a while. Remove references to it from noc, and while at it,
remove a couple of other dangling references (graphite, Rails/Sinatra)
and some now-unused modules (LDAP, proxy, passenger).
Note that since the class is applied to just one box and for simplicity,
no ensure = absents are provided but these will be cleaned up manually.
Change-Id: I02dc96298b75c4aa7cf9e46cb006c21e11cdad60
---
M manifests/misc/noc.pp
D templates/apache/sites/ishmael.wikimedia.org.erb
2 files changed, 1 insertion(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/106455/1
diff --git a/manifests/misc/noc.pp b/manifests/misc/noc.pp
index fde8e7e..e7f5f8f 100644
--- a/manifests/misc/noc.pp
+++ b/manifests/misc/noc.pp
@@ -3,12 +3,9 @@
class misc::noc-wikimedia {
system::role { misc::noc-wikimedia: description =
noc.wikimedia.org }
- package { [ apache2, libapache2-mod-php5,
libapache2-mod-passenger, libsinatra-ruby, rails ]:
+ package { [ 'apache2', 'libapache2-mod-php5' ]:
ensure = latest;
}
-
- include passwords::ldap::wmf_cluster
- $proxypass = $passwords::ldap::wmf_cluster::proxypass
file {
/etc/apache2/sites-available/noc.wikimedia.org:
@@ -18,12 +15,6 @@
owner = root,
group = root,
source =
puppet:///files/apache/sites/noc.wikimedia.org;
- /etc/apache2/sites-available/ishmael.wikimedia.org:
- path =
/etc/apache2/sites-available/ishmael.wikimedia.org,
- content =
template('apache/sites/ishmael.wikimedia.org.erb'),
- mode = 0440,
- owner = root,
- group = www-data;
/usr/lib/cgi-bin:
source = puppet:///files/cgi-bin/noc/,
recurse = true,
@@ -38,14 +29,9 @@
apache_module { php5: name = php5 }
apache_module { userdir: name = userdir }
apache_module { cgi: name = cgi }
- apache_module { ldap: name = ldap }
- apache_module { authnz_ldap: name = authnz_ldap }
- apache_module { proxy: name = proxy }
- apache_module { proxy_http: name = proxy_http }
apache_module { ssl: name = ssl }
apache_site { noc: name = noc.wikimedia.org }
- apache_site { graphiteproxy: name = graphite.wikimedia.org }
service { apache2:
require = [ Package[apache2], Apache_module[userdir],
Apache_module[cgi], Apache_site[noc] ],
@@ -63,4 +49,3 @@
minute = *;
}
}
-
diff --git a/templates/apache/sites/ishmael.wikimedia.org.erb
b/templates/apache/sites/ishmael.wikimedia.org.erb
deleted file mode 100644
index a770cc8..000
--- a/templates/apache/sites/ishmael.wikimedia.org.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-# vim:ft=apache:
-VirtualHost *:80
- ServerName ishmael.wikimedia.org
- Redirect / https://ishmael.wikimedia.org/;
-/VirtualHost
-
-VirtualHost *:443
- ServerName ishmael.wikimedia.org
-
- SSLEngine on
- SSLProtocol -ALL +SSLv3 +TLSv1
- SSLCipherSuite
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
- SSLHonorCipherOrder on
- SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
- SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
-
- Location /
- Order allow,deny
- Allow from all
-
- AuthName WMF Labs (use wiki login name not shell)
- AuthType Basic
- AuthBasicProvider ldap
- AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
- AuthLDAPBindPassword %= proxypass %
- AuthLDAPURL ldap://virt0.wikimedia.org
virt1000.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn
- Require ldap-group cn=wmf,ou=groups,dc=wikimedia,dc=org
- #Require valid-user
-
- ProxyPass http://ishmael.pmtpa.wmnet/
- ProxyPassReverse http://ishmael.pmtpa.wmnet/
- /Location
-
-/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/106455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02dc96298b75c4aa7cf9e46cb006c21e11cdad60
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] noc: remove ishmael cleanup - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: noc: remove ishmael cleanup
..
noc: remove ishmael cleanup
ishmael has been moved into a module, a role class and a different box
(neon) for a while. Remove references to it from noc, and while at it,
remove a couple of other dangling references (graphite, Rails/Sinatra)
and some now-unused modules (LDAP, proxy, passenger).
Note that since the class is applied to just one box and for simplicity,
no ensure = absents are provided but these will be cleaned up manually.
Change-Id: I02dc96298b75c4aa7cf9e46cb006c21e11cdad60
---
M manifests/misc/noc.pp
D templates/apache/sites/ishmael.wikimedia.org.erb
2 files changed, 1 insertion(+), 50 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/noc.pp b/manifests/misc/noc.pp
index fde8e7e..e7f5f8f 100644
--- a/manifests/misc/noc.pp
+++ b/manifests/misc/noc.pp
@@ -3,12 +3,9 @@
class misc::noc-wikimedia {
system::role { misc::noc-wikimedia: description =
noc.wikimedia.org }
- package { [ apache2, libapache2-mod-php5,
libapache2-mod-passenger, libsinatra-ruby, rails ]:
+ package { [ 'apache2', 'libapache2-mod-php5' ]:
ensure = latest;
}
-
- include passwords::ldap::wmf_cluster
- $proxypass = $passwords::ldap::wmf_cluster::proxypass
file {
/etc/apache2/sites-available/noc.wikimedia.org:
@@ -18,12 +15,6 @@
owner = root,
group = root,
source =
puppet:///files/apache/sites/noc.wikimedia.org;
- /etc/apache2/sites-available/ishmael.wikimedia.org:
- path =
/etc/apache2/sites-available/ishmael.wikimedia.org,
- content =
template('apache/sites/ishmael.wikimedia.org.erb'),
- mode = 0440,
- owner = root,
- group = www-data;
/usr/lib/cgi-bin:
source = puppet:///files/cgi-bin/noc/,
recurse = true,
@@ -38,14 +29,9 @@
apache_module { php5: name = php5 }
apache_module { userdir: name = userdir }
apache_module { cgi: name = cgi }
- apache_module { ldap: name = ldap }
- apache_module { authnz_ldap: name = authnz_ldap }
- apache_module { proxy: name = proxy }
- apache_module { proxy_http: name = proxy_http }
apache_module { ssl: name = ssl }
apache_site { noc: name = noc.wikimedia.org }
- apache_site { graphiteproxy: name = graphite.wikimedia.org }
service { apache2:
require = [ Package[apache2], Apache_module[userdir],
Apache_module[cgi], Apache_site[noc] ],
@@ -63,4 +49,3 @@
minute = *;
}
}
-
diff --git a/templates/apache/sites/ishmael.wikimedia.org.erb
b/templates/apache/sites/ishmael.wikimedia.org.erb
deleted file mode 100644
index a770cc8..000
--- a/templates/apache/sites/ishmael.wikimedia.org.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-# vim:ft=apache:
-VirtualHost *:80
- ServerName ishmael.wikimedia.org
- Redirect / https://ishmael.wikimedia.org/;
-/VirtualHost
-
-VirtualHost *:443
- ServerName ishmael.wikimedia.org
-
- SSLEngine on
- SSLProtocol -ALL +SSLv3 +TLSv1
- SSLCipherSuite
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
- SSLHonorCipherOrder on
- SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
- SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
-
- Location /
- Order allow,deny
- Allow from all
-
- AuthName WMF Labs (use wiki login name not shell)
- AuthType Basic
- AuthBasicProvider ldap
- AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
- AuthLDAPBindPassword %= proxypass %
- AuthLDAPURL ldap://virt0.wikimedia.org
virt1000.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn
- Require ldap-group cn=wmf,ou=groups,dc=wikimedia,dc=org
- #Require valid-user
-
- ProxyPass http://ishmael.pmtpa.wmnet/
- ProxyPassReverse http://ishmael.pmtpa.wmnet/
- /Location
-
-/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/106455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I02dc96298b75c4aa7cf9e46cb006c21e11cdad60
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Swift: make temp URLs actually work - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Swift: make temp URLs actually work .. Swift: make temp URLs actually work Temp URLs never worked for private containers, fix this. Change-Id: I0eabd7b54fc79819f3b16ba459fc2291b6559639 --- M templates/swift/proxy-server.conf.erb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/swift/proxy-server.conf.erb b/templates/swift/proxy-server.conf.erb index 760213a..01ec1ab 100644 --- a/templates/swift/proxy-server.conf.erb +++ b/templates/swift/proxy-server.conf.erb @@ -13,9 +13,9 @@ [pipeline:main] % if @auth_backend == 'swauth' -% -pipeline = rewrite healthcheck cache swauth cors proxy-logging proxy-server +pipeline = rewrite healthcheck cache tempurl swauth cors proxy-logging proxy-server % elsif @auth_backend == 'tempauth' -% -pipeline = rewrite healthcheck cache tempauth cors proxy-logging proxy-server +pipeline = rewrite healthcheck cache tempurl tempauth cors proxy-logging proxy-server % end -% [app:proxy-server] -- To view, visit https://gerrit.wikimedia.org/r/106635 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0eabd7b54fc79819f3b16ba459fc2291b6559639 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add SSLCACertificatePath for rt magnesium - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/106640 Change subject: Add SSLCACertificatePath for rt magnesium .. Add SSLCACertificatePath for rt magnesium SSL certificate verification doesn't work right without them, and rt-mailgate especially breaks. Change-Id: I454ce18dcfcbdc00fec615c638b359ef9c82b637 --- M templates/apache/sites/racktables.wikimedia.org.erb M templates/rt/rt4.apache.erb 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/40/106640/1 diff --git a/templates/apache/sites/racktables.wikimedia.org.erb b/templates/apache/sites/racktables.wikimedia.org.erb index c52c38e..3ce2540 100644 --- a/templates/apache/sites/racktables.wikimedia.org.erb +++ b/templates/apache/sites/racktables.wikimedia.org.erb @@ -23,6 +23,7 @@ SSLHonorCipherOrder on SSLCertificateFile %= racktables_ssl_cert % SSLCertificateKeyFile %= racktables_ssl_key % + SSLCACertificatePath /etc/ssl/certs DocumentRoot /srv/org/wikimedia/racktables/wwwroot Directory / diff --git a/templates/rt/rt4.apache.erb b/templates/rt/rt4.apache.erb index fea4439..f3e78d8 100644 --- a/templates/rt/rt4.apache.erb +++ b/templates/rt/rt4.apache.erb @@ -19,6 +19,7 @@ SSLHonorCipherOrder on SSLCertificateFile /etc/ssl/certs/rt.wikimedia.org.pem SSLCertificateKeyFile /etc/ssl/private/rt.wikimedia.org.key + SSLCACertificatePath /etc/ssl/certs AddDefaultCharset UTF-8 -- To view, visit https://gerrit.wikimedia.org/r/106640 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I454ce18dcfcbdc00fec615c638b359ef9c82b637 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: don't allow PUT for temp URLs - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: swift: don't allow PUT for temp URLs .. swift: don't allow PUT for temp URLs Change-Id: Id5783851ac46e6a9f393da2187841750375e52a1 --- M templates/swift/proxy-server.conf.erb 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/templates/swift/proxy-server.conf.erb b/templates/swift/proxy-server.conf.erb index 01ec1ab..e654c04 100644 --- a/templates/swift/proxy-server.conf.erb +++ b/templates/swift/proxy-server.conf.erb @@ -26,6 +26,11 @@ account_autocreate = true % end -% +[filter:tempurl] +use = egg:swift#tempurl +# default includes PUT +methods = GET HEAD + % if @auth_backend == 'swauth' -% [filter:swauth] use = egg:swauth#swauth @@ -74,4 +79,3 @@ paste.filter_factory = wmf.rewrite:filter_factory - -- To view, visit https://gerrit.wikimedia.org/r/106637 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id5783851ac46e6a9f393da2187841750375e52a1 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add SSLCACertificatePath for rt magnesium - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Add SSLCACertificatePath for rt magnesium .. Add SSLCACertificatePath for rt magnesium SSL certificate verification doesn't work right without them, and rt-mailgate especially breaks. Change-Id: I454ce18dcfcbdc00fec615c638b359ef9c82b637 --- M templates/apache/sites/racktables.wikimedia.org.erb M templates/rt/rt4.apache.erb 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/apache/sites/racktables.wikimedia.org.erb b/templates/apache/sites/racktables.wikimedia.org.erb index c52c38e..3ce2540 100644 --- a/templates/apache/sites/racktables.wikimedia.org.erb +++ b/templates/apache/sites/racktables.wikimedia.org.erb @@ -23,6 +23,7 @@ SSLHonorCipherOrder on SSLCertificateFile %= racktables_ssl_cert % SSLCertificateKeyFile %= racktables_ssl_key % + SSLCACertificatePath /etc/ssl/certs DocumentRoot /srv/org/wikimedia/racktables/wwwroot Directory / diff --git a/templates/rt/rt4.apache.erb b/templates/rt/rt4.apache.erb index fea4439..f3e78d8 100644 --- a/templates/rt/rt4.apache.erb +++ b/templates/rt/rt4.apache.erb @@ -19,6 +19,7 @@ SSLHonorCipherOrder on SSLCertificateFile /etc/ssl/certs/rt.wikimedia.org.pem SSLCertificateKeyFile /etc/ssl/private/rt.wikimedia.org.key + SSLCACertificatePath /etc/ssl/certs AddDefaultCharset UTF-8 -- To view, visit https://gerrit.wikimedia.org/r/106640 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I454ce18dcfcbdc00fec615c638b359ef9c82b637 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync EQIAD before PMTPA - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Sync EQIAD before PMTPA .. Sync EQIAD before PMTPA Why are we still syncing to PMTPA? Change-Id: I988c6111649610d7470e623489557c321d09d100 --- M files/dsh/group/mediawiki-installation 1 file changed, 198 insertions(+), 197 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/files/dsh/group/mediawiki-installation b/files/dsh/group/mediawiki-installation index 7f72989..a82fc2b 100644 --- a/files/dsh/group/mediawiki-installation +++ b/files/dsh/group/mediawiki-installation @@ -6,207 +6,10 @@ tin terbium -mw1 -mw2 -mw3 -mw4 -mw5 -mw6 -mw7 -mw8 -mw9 -mw10 -mw11 -mw12 -mw13 -mw14 -mw15 -mw16 -mw17 -mw18 -mw19 -mw20 -mw21 -mw22 -mw23 -mw24 -mw25 -mw26 -mw27 -mw28 -mw29 -mw30 -mw31 -mw32 -mw33 -mw34 -mw35 -mw36 -mw37 -mw38 -mw39 -mw40 -mw41 -mw42 -mw43 -mw44 -mw45 -mw46 -mw47 -mw48 -mw49 - -mw51 -mw52 -mw53 -mw54 -mw55 -mw56 -mw57 -mw58 -mw59 -mw60 -mw61 -mw62 -mw63 -mw64 -mw65 -mw66 -mw67 -mw68 -mw69 -mw70 -mw71 -mw72 -mw73 -mw74 -mw75 -mw76 -mw77 -mw78 -mw79 -mw80 -mw81 -mw82 -mw83 -mw84 -mw85 -mw86 -mw87 -mw88 -mw89 -mw90 -mw91 -mw92 -mw93 -mw94 -mw95 -mw96 -mw97 -mw98 -mw99 -mw100 -mw101 -mw102 -mw103 -mw104 -mw105 -mw106 -mw107 -mw108 -mw109 - -mw111 -mw112 -mw113 -mw114 -mw115 -mw116 -mw117 -mw118 -mw119 -mw120 -mw121 -mw122 -mw123 -mw124 -mw125 - -srv193 -srv235 -srv236 -srv237 -srv238 -srv239 -srv240 -srv241 -srv242 -srv243 -srv244 -srv245 -srv246 -srv247 -srv248 -srv249 -srv250 -srv251 -srv252 -srv253 -srv254 -srv255 -srv256 -srv257 -srv258 -srv259 -srv260 -srv261 -srv262 -srv263 -srv264 -srv265 -srv267 -srv268 -srv269 -srv270 -srv271 -srv272 -srv273 -srv274 -srv275 -srv276 -srv277 -srv279 -srv280 -srv282 -srv283 -srv284 -srv285 -srv286 -srv287 -srv288 -srv289 -srv290 -srv291 -srv292 -srv293 -srv294 -srv295 -srv296 -srv297 -srv298 -srv299 -srv300 -srv301 -snapshot1 -snapshot2 -snapshot3 -snapshot4 snapshot1001 snapshot1002 snapshot1003 snapshot1004 -tmh1 -tmh2 tmh1001 tmh1002 mw1001 @@ -429,3 +232,201 @@ mw1218 mw1219 mw1220 + +mw1 +mw2 +mw3 +mw4 +mw5 +mw6 +mw7 +mw8 +mw9 +mw10 +mw11 +mw12 +mw13 +mw14 +mw15 +mw16 +mw17 +mw18 +mw19 +mw20 +mw21 +mw22 +mw23 +mw24 +mw25 +mw26 +mw27 +mw28 +mw29 +mw30 +mw31 +mw32 +mw33 +mw34 +mw35 +mw36 +mw37 +mw38 +mw39 +mw40 +mw41 +mw42 +mw43 +mw44 +mw45 +mw46 +mw47 +mw48 +mw49 + +mw51 +mw52 +mw53 +mw54 +mw55 +mw56 +mw57 +mw58 +mw59 +mw60 +mw61 +mw62 +mw63 +mw64 +mw65 +mw66 +mw67 +mw68 +mw69 +mw70 +mw71 +mw72 +mw73 +mw74 +mw75 +mw76 +mw77 +mw78 +mw79 +mw80 +mw81 +mw82 +mw83 +mw84 +mw85 +mw86 +mw87 +mw88 +mw89 +mw90 +mw91 +mw92 +mw93 +mw94 +mw95 +mw96 +mw97 +mw98 +mw99 +mw100 +mw101 +mw102 +mw103 +mw104 +mw105 +mw106 +mw107 +mw108 +mw109 + +mw111 +mw112 +mw113 +mw114 +mw115 +mw116 +mw117 +mw118 +mw119 +mw120 +mw121 +mw122 +mw123 +mw124 +mw125 + +srv193 +srv235 +srv236 +srv237 +srv238 +srv239 +srv240 +srv241 +srv242 +srv243 +srv244 +srv245 +srv246 +srv247 +srv248 +srv249 +srv250 +srv251 +srv252 +srv253 +srv254 +srv255 +srv256 +srv257 +srv258 +srv259 +srv260 +srv261 +srv262 +srv263 +srv264 +srv265 +srv267 +srv268 +srv269 +srv270 +srv271 +srv272 +srv273 +srv274 +srv275 +srv276 +srv277 +srv279 +srv280 +srv282 +srv283 +srv284 +srv285 +srv286 +srv287 +srv288 +srv289 +srv290 +srv291 +srv292 +srv293 +srv294 +srv295 +srv296 +srv297 +srv298 +srv299 +srv300 +srv301 +snapshot1 +snapshot2 +snapshot3 +snapshot4 +tmh1 +tmh2 \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/105006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I988c6111649610d7470e623489557c321d09d100 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove chapter domains that aren't delegated to us - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged. Change subject: Remove chapter domains that aren't delegated to us .. Remove chapter domains that aren't delegated to us Remove the following domain names that are in our zones but don't actually use our name servers: wikimedia.hu - registrant: Wikimedia Hungary Association dns: ns0.grin.hu / ns2.grin.hu wikimedia.li - registrant: WMF Inc. dns: ns1/2.masterdns.com (pending NS change?) wikimedia.pl - registrant: WMF Inc. dns: fns1/2.42.pl(pending NS change?) wikipedia.co.uk - registrant: Bomis, Inc. dns: dns*.register.com wikipedia.fr - registrant: ASSOCIATION WIKIMEDIA FRANCE dns: *.dns.gandi.net wikipedia.nl - registrant: Vereniging Wikimedia Nederland dns: *.pcextreme.nl RT: 5681 RT: 5860 Change-Id: I9cdfbb94d2b19918f0c7935e58ef25b7f8a48418 --- D templates/wikimedia.hu D templates/wikimedia.li D templates/wikimedia.pl D templates/wikipedia.co.uk D templates/wikipedia.fr D templates/wikipedia.nl 6 files changed, 0 insertions(+), 6 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.hu b/templates/wikimedia.hu deleted file mode 12 index 9ccc2ba..000 --- a/templates/wikimedia.hu +++ /dev/null @@ -1 +0,0 @@ -wikimedia.com \ No newline at end of file diff --git a/templates/wikimedia.li b/templates/wikimedia.li deleted file mode 12 index 9ccc2ba..000 --- a/templates/wikimedia.li +++ /dev/null @@ -1 +0,0 @@ -wikimedia.com \ No newline at end of file diff --git a/templates/wikimedia.pl b/templates/wikimedia.pl deleted file mode 12 index 9ccc2ba..000 --- a/templates/wikimedia.pl +++ /dev/null @@ -1 +0,0 @@ -wikimedia.com \ No newline at end of file diff --git a/templates/wikipedia.co.uk b/templates/wikipedia.co.uk deleted file mode 12 index f8431e2..000 --- a/templates/wikipedia.co.uk +++ /dev/null @@ -1 +0,0 @@ -wikipedia.org \ No newline at end of file diff --git a/templates/wikipedia.fr b/templates/wikipedia.fr deleted file mode 12 index f8431e2..000 --- a/templates/wikipedia.fr +++ /dev/null @@ -1 +0,0 @@ -wikipedia.org \ No newline at end of file diff --git a/templates/wikipedia.nl b/templates/wikipedia.nl deleted file mode 12 index f8431e2..000 --- a/templates/wikipedia.nl +++ /dev/null @@ -1 +0,0 @@ -wikipedia.org \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/86659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9cdfbb94d2b19918f0c7935e58ef25b7f8a48418 Gerrit-PatchSet: 3 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Jalexander jalexan...@wikimedia.org Gerrit-Reviewer: Jeremyb jer...@tuxmachine.com Gerrit-Reviewer: RobH r...@wikimedia.org Gerrit-Reviewer: Thehelpfulone thehelpfulonew...@gmail.com Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot Gerrit-Reviewer: saper sa...@saper.info ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish: simplify the mobile redirect regexp - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/106669
Change subject: varnish: simplify the mobile redirect regexp
..
varnish: simplify the mobile redirect regexp
Now that we don't have to maintain squid redirector compatibility,
rewrite the huge, almost unreadable, mobile redirect regexp in three
distinct, easier to maintain redirects.
This was done with efficiency in mind and avoids checking for the same
match twice. The three redirects are likely to be slower than one, but
this is hopefully offset by not checking for e.g. wikimedia three
times. Plus, the regsubs are within the multiple-clause UA/cookie/url
guard, so it only does matter for a small minority of hits.
Change-Id: Iebfbc46d1a6a878d5c074ac44b8f2a8cda82
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/69/106669/1
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index c3474da..8e98b78 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -26,7 +26,14 @@
req.http.User-Agent !~
(iPad|Android.3|(?i)tablet|PlayBook|Wii)
req.http.Cookie !~
(stopMobileRedirect=true|mf_useformat=desktop)
req.url ~ ^/wiki/) {
- set req.http.MobileHost = regsub(req.http.Host,
^(?:www\.(?=mediawiki))?((?:commons|species|meta|incubator|outreach|strategy|wikimania201[234])\.(?=wikimedia)|(?!www)\w+\.(?!wikimedia|mediawiki)|(?=mediawiki|wikimediafoundation))(wikimedia|wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage|mediawiki|wikimediafoundation)\.,
\1m.\2.);
+
+ # Separate regexps for clarity, but multiple regsubs instead of
+ # if host ~/regsub matches for efficiency. Be careful to not
+ # write overlapping/chaining regexps.
+ set req.http.MobileHost = regsub(req.http.Host,
^(www\.)?(mediawiki|wikimediafoundation)\., m.\1.);
+ set req.http.MobileHost = regsub(req.http.Host,
^(commons|species|meta|incubator|outreach|strategy|wikimania201[234])\.(wikimedia)\.,
\1.m.\2.);
+ set req.http.MobileHost = regsub(req.http.Host,
^((?!www)\w+)\.(wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage)\.,
\1.m.\2.);
+
if (req.http.Host != req.http.MobileHost) {
if (req.http.X-Forwarded-Proto) {
set req.http.Location =
req.http.X-Forwarded-Proto + :// + req.http.MobileHost + req.url;
--
To view, visit https://gerrit.wikimedia.org/r/106669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebfbc46d1a6a878d5c074ac44b8f2a8cda82
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Temporarily disable multi-master salt - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Temporarily disable multi-master salt
..
Temporarily disable multi-master salt
Change-Id: Ie3c8426ac2a19175580c1b4d26faa5e0eab4ded1
---
M manifests/role/salt.pp
M modules/salt/templates/minion.erb
2 files changed, 15 insertions(+), 6 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 64aa816..3b30486 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -120,7 +120,16 @@
cluster = $cluster,
}
} else {
- $salt_master = [ sockpuppet.pmtpa.wmnet,
palladium.eqiad.wmnet ]
+ ## Disabling multi-master salt for now, until synchronization
+ ## issues are handled for puppet managing salt.
+ ## When minions fetch modules/returners/pillars/etc. it's
necessary
+ ## for both salt masters to have the same sets of data or
inconsistencies
+ ## can occur.
+ #$salt_master = $site ? {
+ # pmtpa = [ sockpuppet.pmtpa.wmnet,
palladium.eqiad.wmnet ],
+ # eqiad = [ palladium.eqiad.wmnet,
sockpuppet.pmtpa.wmnet ],
+ #}
+ $salt_master = palladium.eqiad.wmnet
$salt_client_id = ${fqdn}
$salt_grains = {
realm = $realm,
diff --git a/modules/salt/templates/minion.erb
b/modules/salt/templates/minion.erb
index 100cfa6..b324632 100644
--- a/modules/salt/templates/minion.erb
+++ b/modules/salt/templates/minion.erb
@@ -8,14 +8,14 @@
# Set the location of the salt master server, if the master server cannot be
# resolved, then the minion will fail to start.
-% if salt_master.is_a? Array %
+% if salt_master.is_a? Array -%
master:
-% salt_master.each do |name| %
+% salt_master.each do |name| -%
- %= name %
-% end %
-% else %
+% end -%
+% else -%
master: %= salt_master %
-% end %
+% end -%
# Set the number of seconds to wait before attempting to resolve
# the master hostname if name resolution fails. Defaults to 30 seconds.
--
To view, visit https://gerrit.wikimedia.org/r/111746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3c8426ac2a19175580c1b4d26faa5e0eab4ded1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch BD, ID, MN to ulsfo - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged. Change subject: Switch BD, ID, MN to ulsfo .. Switch BD, ID, MN to ulsfo Switch Bangladesh, Indonesia, Mongolia, or about 50 million Internet users. Change-Id: Ib4279c08c9f86e392e2fd1651cadcd2b6e94716f --- M config-geo 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/config-geo b/config-geo index 3abdc79..c74327e 100644 --- a/config-geo +++ b/config-geo @@ -13,7 +13,7 @@ AM = esams, # Armenia AP = eqiad, # Asia-Pacific region (misc) AZ = esams, # Azerbaijan - BD = eqiad, # Bangladesh + BD = ulsfo, # Bangladesh BH = esams, # Bahrain BN = eqiad, # Brunei Darussalam BT = eqiad, # Bhutan @@ -23,7 +23,7 @@ CY = esams, # Cyprus GE = esams, # Georgia HK = eqiad, # Hong Kong - ID = eqiad, # Indonesia + ID = ulsfo, # Indonesia IL = esams, # Israel IN = eqiad, # India IO = eqiad, # British Indian Ocean Territory @@ -41,7 +41,7 @@ LB = esams, # Lebanon LK = eqiad, # Sri Lanka MM = eqiad, # Myanmar - MN = eqiad, # Mongolia + MN = ulsfo, # Mongolia MO = eqiad, # Macao MV = eqiad, # Maldives MY = ulsfo, # Malaysia -- To view, visit https://gerrit.wikimedia.org/r/111775 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4279c08c9f86e392e2fd1651cadcd2b6e94716f Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch BD, ID, MN to ulsfo - change (operations/dns)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/111775 Change subject: Switch BD, ID, MN to ulsfo .. Switch BD, ID, MN to ulsfo Switch Bangladesh, Indonesia, Mongolia, or about 50 million Internet users. Change-Id: Ib4279c08c9f86e392e2fd1651cadcd2b6e94716f --- M config-geo 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/75/111775/1 diff --git a/config-geo b/config-geo index 3abdc79..c74327e 100644 --- a/config-geo +++ b/config-geo @@ -13,7 +13,7 @@ AM = esams, # Armenia AP = eqiad, # Asia-Pacific region (misc) AZ = esams, # Azerbaijan - BD = eqiad, # Bangladesh + BD = ulsfo, # Bangladesh BH = esams, # Bahrain BN = eqiad, # Brunei Darussalam BT = eqiad, # Bhutan @@ -23,7 +23,7 @@ CY = esams, # Cyprus GE = esams, # Georgia HK = eqiad, # Hong Kong - ID = eqiad, # Indonesia + ID = ulsfo, # Indonesia IL = esams, # Israel IN = eqiad, # India IO = eqiad, # British Indian Ocean Territory @@ -41,7 +41,7 @@ LB = esams, # Lebanon LK = eqiad, # Sri Lanka MM = eqiad, # Myanmar - MN = eqiad, # Mongolia + MN = ulsfo, # Mongolia MO = eqiad, # Macao MV = eqiad, # Maldives MY = ulsfo, # Malaysia -- To view, visit https://gerrit.wikimedia.org/r/111775 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4279c08c9f86e392e2fd1651cadcd2b6e94716f Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch VN to ulsfo - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Switch VN to ulsfo
..
Switch VN to ulsfo
Viet Nam, or about 35 million Internet users.
Change-Id: I30f0c020620a6171a14a5ff2c86687d02b57fada
---
M config-geo
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config-geo b/config-geo
index c74327e..ccaa5bc 100644
--- a/config-geo
+++ b/config-geo
@@ -60,7 +60,7 @@
TM = eqiad, # Turkmenistan
TW = ulsfo, # Taiwan, Province of China
UZ = eqiad, # Uzbekistan
- VN = eqiad, # Viet Nam
+ VN = ulsfo, # Viet Nam
YE = esams, # Yemen
},
EU = {
--
To view, visit https://gerrit.wikimedia.org/r/111779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I30f0c020620a6171a14a5ff2c86687d02b57fada
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch VN to ulsfo - change (operations/dns)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/111779
Change subject: Switch VN to ulsfo
..
Switch VN to ulsfo
Viet Nam, or about 35 million Internet users.
Change-Id: I30f0c020620a6171a14a5ff2c86687d02b57fada
---
M config-geo
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/79/111779/1
diff --git a/config-geo b/config-geo
index c74327e..ccaa5bc 100644
--- a/config-geo
+++ b/config-geo
@@ -60,7 +60,7 @@
TM = eqiad, # Turkmenistan
TW = ulsfo, # Taiwan, Province of China
UZ = eqiad, # Uzbekistan
- VN = eqiad, # Viet Nam
+ VN = ulsfo, # Viet Nam
YE = esams, # Yemen
},
EU = {
--
To view, visit https://gerrit.wikimedia.org/r/111779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30f0c020620a6171a14a5ff2c86687d02b57fada
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch TH MM to ulsfo - change (operations/dns)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/111782 Change subject: Switch TH MM to ulsfo .. Switch TH MM to ulsfo Thailand Myanmar, approximately 18 million Internet users. Change-Id: I26c2641dcd88089cfdb1473a1593bc898aa3f6f2 --- M config-geo 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/82/111782/1 diff --git a/config-geo b/config-geo index ccaa5bc..354947f 100644 --- a/config-geo +++ b/config-geo @@ -40,7 +40,7 @@ LA = eqiad, # Lao People's Democratic Republic LB = esams, # Lebanon LK = eqiad, # Sri Lanka - MM = eqiad, # Myanmar + MM = ulsfo, # Myanmar MN = ulsfo, # Mongolia MO = eqiad, # Macao MV = eqiad, # Maldives @@ -54,7 +54,7 @@ SA = esams, # Saudi Arabia SG = ulsfo, # Singapore SY = esams, # Syrian Arab Republic - TH = eqiad, # Thailand + TH = ulsfo, # Thailand TJ = eqiad, # Tajikistan TL = eqiad, # Timor-Leste TM = eqiad, # Turkmenistan -- To view, visit https://gerrit.wikimedia.org/r/111782 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26c2641dcd88089cfdb1473a1593bc898aa3f6f2 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch TH MM to ulsfo - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged. Change subject: Switch TH MM to ulsfo .. Switch TH MM to ulsfo Thailand Myanmar, approximately 18 million Internet users. Change-Id: I26c2641dcd88089cfdb1473a1593bc898aa3f6f2 --- M config-geo 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/config-geo b/config-geo index ccaa5bc..354947f 100644 --- a/config-geo +++ b/config-geo @@ -40,7 +40,7 @@ LA = eqiad, # Lao People's Democratic Republic LB = esams, # Lebanon LK = eqiad, # Sri Lanka - MM = eqiad, # Myanmar + MM = ulsfo, # Myanmar MN = ulsfo, # Mongolia MO = eqiad, # Macao MV = eqiad, # Maldives @@ -54,7 +54,7 @@ SA = esams, # Saudi Arabia SG = ulsfo, # Singapore SY = esams, # Syrian Arab Republic - TH = eqiad, # Thailand + TH = ulsfo, # Thailand TJ = eqiad, # Tajikistan TL = eqiad, # Timor-Leste TM = eqiad, # Turkmenistan -- To view, visit https://gerrit.wikimedia.org/r/111782 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I26c2641dcd88089cfdb1473a1593bc898aa3f6f2 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Point US Canada west coastal states to ulsfo - change (operations/dns)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/111784
Change subject: Point US Canada west coastal states to ulsfo
..
Point US Canada west coastal states to ulsfo
Alaska, Hawaii, the US coastal states (California, Oregon, Washington)
Canada's west territories (British Columbia, Yukon).
Change-Id: I48e433474e530fe6efe85b84c09d16c4844255b6
---
M config-geo
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/84/111784/1
diff --git a/config-geo b/config-geo
index 354947f..2a3d8f9 100644
--- a/config-geo
+++ b/config-geo
@@ -120,18 +120,18 @@
},
NA = {
US = { # United States of America
- AK = eqiad, # Alaska
+ AK = ulsfo, # Alaska
AL = eqiad, # Alabama
AR = eqiad, # Arkansas
AZ = eqiad, # Arizona
- CA = eqiad, # California
+ CA = ulsfo, # California
CO = eqiad, # Colorado
CT = eqiad, # Connecticut
DC = eqiad, # District of
Columbia
DE = eqiad, # Delaware
FL = eqiad, # Florida
GA = eqiad, # Georgia
- HI = eqiad, # Hawaii
+ HI = ulsfo, # Hawaii
IA = eqiad, # Iowa
ID = eqiad, # Idaho
IL = eqiad, # Illinois
@@ -157,7 +157,7 @@
NY = eqiad, # New York
OH = eqiad, # Ohio
OK = eqiad, # Oklahoma
- OR = eqiad, # Oregon
+ OR = ulsfo, # Oregon
PA = eqiad, # Pennsylvania
RI = eqiad, # Rhode Island
SC = eqiad, # South Carolina
@@ -167,14 +167,14 @@
UT = eqiad, # Utah
VA = eqiad, # Virginia
VT = eqiad, # Vermont
- WA = eqiad, # Washington
+ WA = ulsfo, # Washington
WI = eqiad, # Wisconsin
WV = eqiad, # West Virginia
WY = eqiad, # Wyoming
},
CA = { # Canada
AB = eqiad, # Alberta
- BC = eqiad, # British Columbia
+ BC = ulsfo, # British Columbia
MB = eqiad, # Manitoba
NB = eqiad, # New Brunswick
NL = eqiad, # Newfoundland
@@ -185,7 +185,7 @@
PE = eqiad, # Prince Edward
Island
QC = eqiad, # Quebec
SK = eqiad, # Saskatchewan
- YT = eqiad, # Yukon Territory
+ YT = ulsfo, # Yukon Territory
},
},
OC = ulsfo,
--
To view, visit https://gerrit.wikimedia.org/r/111784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48e433474e530fe6efe85b84c09d16c4844255b6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Point US Canada west coastal states to ulsfo - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Point US Canada west coastal states to ulsfo
..
Point US Canada west coastal states to ulsfo
Alaska, Hawaii, the US coastal states (California, Oregon, Washington)
Canada's west territories (British Columbia, Yukon).
Change-Id: I48e433474e530fe6efe85b84c09d16c4844255b6
---
M config-geo
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config-geo b/config-geo
index 354947f..2a3d8f9 100644
--- a/config-geo
+++ b/config-geo
@@ -120,18 +120,18 @@
},
NA = {
US = { # United States of America
- AK = eqiad, # Alaska
+ AK = ulsfo, # Alaska
AL = eqiad, # Alabama
AR = eqiad, # Arkansas
AZ = eqiad, # Arizona
- CA = eqiad, # California
+ CA = ulsfo, # California
CO = eqiad, # Colorado
CT = eqiad, # Connecticut
DC = eqiad, # District of
Columbia
DE = eqiad, # Delaware
FL = eqiad, # Florida
GA = eqiad, # Georgia
- HI = eqiad, # Hawaii
+ HI = ulsfo, # Hawaii
IA = eqiad, # Iowa
ID = eqiad, # Idaho
IL = eqiad, # Illinois
@@ -157,7 +157,7 @@
NY = eqiad, # New York
OH = eqiad, # Ohio
OK = eqiad, # Oklahoma
- OR = eqiad, # Oregon
+ OR = ulsfo, # Oregon
PA = eqiad, # Pennsylvania
RI = eqiad, # Rhode Island
SC = eqiad, # South Carolina
@@ -167,14 +167,14 @@
UT = eqiad, # Utah
VA = eqiad, # Virginia
VT = eqiad, # Vermont
- WA = eqiad, # Washington
+ WA = ulsfo, # Washington
WI = eqiad, # Wisconsin
WV = eqiad, # West Virginia
WY = eqiad, # Wyoming
},
CA = { # Canada
AB = eqiad, # Alberta
- BC = eqiad, # British Columbia
+ BC = ulsfo, # British Columbia
MB = eqiad, # Manitoba
NB = eqiad, # New Brunswick
NL = eqiad, # Newfoundland
@@ -185,7 +185,7 @@
PE = eqiad, # Prince Edward
Island
QC = eqiad, # Quebec
SK = eqiad, # Saskatchewan
- YT = eqiad, # Yukon Territory
+ YT = ulsfo, # Yukon Territory
},
},
OC = ulsfo,
--
To view, visit https://gerrit.wikimedia.org/r/111784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48e433474e530fe6efe85b84c09d16c4844255b6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch the rest of the NA western states to ulsfo - change (operations/dns)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/111788
Change subject: Switch the rest of the NA western states to ulsfo
..
Switch the rest of the NA western states to ulsfo
Arizona, Colorado, Idaho, Montana, New Mexico, Nevada, Utah, Wyoming
from the US Alberta, Northwest Territories Saskatchewan from Canada.
Change-Id: I36dcdf58b2c0e5ed6ac4a0d6598f04a28da3f359
---
M config-geo
1 file changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/88/111788/1
diff --git a/config-geo b/config-geo
index 2a3d8f9..99c5140 100644
--- a/config-geo
+++ b/config-geo
@@ -123,9 +123,9 @@
AK = ulsfo, # Alaska
AL = eqiad, # Alabama
AR = eqiad, # Arkansas
- AZ = eqiad, # Arizona
+ AZ = ulsfo, # Arizona
CA = ulsfo, # California
- CO = eqiad, # Colorado
+ CO = ulsfo, # Colorado
CT = eqiad, # Connecticut
DC = eqiad, # District of
Columbia
DE = eqiad, # Delaware
@@ -133,7 +133,7 @@
GA = eqiad, # Georgia
HI = ulsfo, # Hawaii
IA = eqiad, # Iowa
- ID = eqiad, # Idaho
+ ID = ulsfo, # Idaho
IL = eqiad, # Illinois
IN = eqiad, # Indiana
KS = eqiad, # Kansas
@@ -146,14 +146,14 @@
MN = eqiad, # Minnesota
MO = eqiad, # Missouri
MS = eqiad, # Mississippi
- MT = eqiad, # Montana
+ MT = ulsfo, # Montana
NC = eqiad, # North Carolina
ND = eqiad, # North Dakota
NE = eqiad, # Nebraska
NH = eqiad, # New Hampshire
NJ = eqiad, # New Jersey
- NM = eqiad, # New Mexico
- NV = eqiad, # Nevada
+ NM = ulsfo, # New Mexico
+ NV = ulsfo, # Nevada
NY = eqiad, # New York
OH = eqiad, # Ohio
OK = eqiad, # Oklahoma
@@ -164,27 +164,27 @@
SD = eqiad, # South Dakota
TN = eqiad, # Tennessee
TX = eqiad, # Texas
- UT = eqiad, # Utah
+ UT = ulsfo, # Utah
VA = eqiad, # Virginia
VT = eqiad, # Vermont
WA = ulsfo, # Washington
WI = eqiad, # Wisconsin
WV = eqiad, # West Virginia
- WY = eqiad, # Wyoming
+ WY = ulsfo, # Wyoming
},
CA = { # Canada
- AB = eqiad, # Alberta
+ AB = ulsfo, # Alberta
BC = ulsfo, # British Columbia
MB = eqiad, # Manitoba
NB = eqiad, # New Brunswick
NL = eqiad, # Newfoundland
NS = eqiad, # Nova Scotia
- NT = eqiad, # Northwest
Territories
+ NT = ulsfo,
[MediaWiki-commits] [Gerrit] Switch the rest of the NA western states to ulsfo - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Switch the rest of the NA western states to ulsfo
..
Switch the rest of the NA western states to ulsfo
Arizona, Colorado, Idaho, Montana, New Mexico, Nevada, Utah, Wyoming
from the US Alberta, Northwest Territories from Canada.
Change-Id: I36dcdf58b2c0e5ed6ac4a0d6598f04a28da3f359
---
M config-geo
1 file changed, 10 insertions(+), 10 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config-geo b/config-geo
index 2a3d8f9..838cbd9 100644
--- a/config-geo
+++ b/config-geo
@@ -123,9 +123,9 @@
AK = ulsfo, # Alaska
AL = eqiad, # Alabama
AR = eqiad, # Arkansas
- AZ = eqiad, # Arizona
+ AZ = ulsfo, # Arizona
CA = ulsfo, # California
- CO = eqiad, # Colorado
+ CO = ulsfo, # Colorado
CT = eqiad, # Connecticut
DC = eqiad, # District of
Columbia
DE = eqiad, # Delaware
@@ -133,7 +133,7 @@
GA = eqiad, # Georgia
HI = ulsfo, # Hawaii
IA = eqiad, # Iowa
- ID = eqiad, # Idaho
+ ID = ulsfo, # Idaho
IL = eqiad, # Illinois
IN = eqiad, # Indiana
KS = eqiad, # Kansas
@@ -146,14 +146,14 @@
MN = eqiad, # Minnesota
MO = eqiad, # Missouri
MS = eqiad, # Mississippi
- MT = eqiad, # Montana
+ MT = ulsfo, # Montana
NC = eqiad, # North Carolina
ND = eqiad, # North Dakota
NE = eqiad, # Nebraska
NH = eqiad, # New Hampshire
NJ = eqiad, # New Jersey
- NM = eqiad, # New Mexico
- NV = eqiad, # Nevada
+ NM = ulsfo, # New Mexico
+ NV = ulsfo, # Nevada
NY = eqiad, # New York
OH = eqiad, # Ohio
OK = eqiad, # Oklahoma
@@ -164,22 +164,22 @@
SD = eqiad, # South Dakota
TN = eqiad, # Tennessee
TX = eqiad, # Texas
- UT = eqiad, # Utah
+ UT = ulsfo, # Utah
VA = eqiad, # Virginia
VT = eqiad, # Vermont
WA = ulsfo, # Washington
WI = eqiad, # Wisconsin
WV = eqiad, # West Virginia
- WY = eqiad, # Wyoming
+ WY = ulsfo, # Wyoming
},
CA = { # Canada
- AB = eqiad, # Alberta
+ AB = ulsfo, # Alberta
BC = ulsfo, # British Columbia
MB = eqiad, # Manitoba
NB = eqiad, # New Brunswick
NL = eqiad, # Newfoundland
NS = eqiad, # Nova Scotia
- NT = eqiad, # Northwest
Territories
+ NT = ulsfo, # Northwest
Territories
[MediaWiki-commits] [Gerrit] Switch copper to Ubuntu trusty - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112466
Change subject: Switch copper to Ubuntu trusty
..
Switch copper to Ubuntu trusty
copper is a Swift test/replication host; we can safely use it for such
experiments.
Change-Id: I6ee51feb48187629aeae2ac904245b65e97fc13b
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/112466/1
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 0810ee8..e332864 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -337,6 +337,9 @@
host copper {
hardware ethernet 78:2b:cb:09:0e:9d;
fixed-address copper.eqiad.wmnet;
+
+ option pxelinux.pathprefix trusty-installer/;
+ filename trusty-installer/ubuntu-installer/amd64/pxelinux.0;
}
host cp1037 {
--
To view, visit https://gerrit.wikimedia.org/r/112466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ee51feb48187629aeae2ac904245b65e97fc13b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: add Ubuntu 14.04/Trusty Tahr - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: install-server: add Ubuntu 14.04/Trusty Tahr .. install-server: add Ubuntu 14.04/Trusty Tahr Add the debian-installer PXE configs for Trusty, as well as the reprepro bits to setup the new apt repository for the new distribution. Change-Id: I0ce1c067db7fe382ebe7282492c695dadc6edae9 --- M modules/install-server/files/reprepro/distributions M modules/install-server/files/reprepro/incoming A modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/boot.txt A modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 A modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 A modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 A modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS1-115200 A modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS1-57600 A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/adtxt.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/exithelp.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f1.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f10.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f2.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f3.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f4.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f5.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f6.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f7.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f8.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f9.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/menu.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/prompt.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/rqtxt.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/splash.png A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/stdmenu.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/syslinux.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/txt.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/vesamenu.c32 A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/pxelinux.cfg/default A modules/install-server/files/tftpboot/trusty-installer/version.info 30 files changed, 400 insertions(+), 1 deletion(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/install-server/files/reprepro/distributions b/modules/install-server/files/reprepro/distributions index 73aa533..353aeaa 100644 --- a/modules/install-server/files/reprepro/distributions +++ b/modules/install-server/files/reprepro/distributions @@ -56,3 +56,18 @@ DebOverride: deb-override Log: log + +Origin: Wikimedia +Label: Wikimedia +Suite: trusty-wikimedia +Codename: trusty-wikimedia +Version: 14.04 +Architectures: source amd64 +Components: main universe non-free +UDebComponents: main +Update: hwraid +Description: Wikimedia specific packages for Ubuntu Trusty Tahr +SignWith: default +DebOverride: deb-override +Log: + log diff --git a/modules/install-server/files/reprepro/incoming b/modules/install-server/files/reprepro/incoming index d0a74d8..c544479 100644 --- a/modules/install-server/files/reprepro/incoming +++ b/modules/install-server/files/reprepro/incoming @@ -1,4 +1,4 @@ Name: default IncomingDir: incoming TempDir: /tmp -Allow: hardy-wikimedia karmic-wikimedia lucid-wikimedia lucid-wikimedia-mysql hardyhardy-wikimedia karmickarmic-wikimedia lucidlucid-wikimedia preciseprecise-wikimedia +Allow: hardy-wikimedia lucid-wikimedia lucid-wikimedia-mysql precise-wikimedia trusty-wikimedia hardyhardy-wikimedia lucidlucid-wikimedia preciseprecise-wikimedia trustytrusty-wikimedia diff --git a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/boot.txt b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/boot.txt new file mode 100644 index 000..adfdfbd --- /dev/null +++
[MediaWiki-commits] [Gerrit] install-server: add Ubuntu 14.04/Trusty Tahr - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112465 Change subject: install-server: add Ubuntu 14.04/Trusty Tahr .. install-server: add Ubuntu 14.04/Trusty Tahr Add the debian-installer PXE configs for Trusty, as well as the reprepro bits to setup the new apt repository for the new distribution. Change-Id: I0ce1c067db7fe382ebe7282492c695dadc6edae9 --- M modules/install-server/files/reprepro/distributions M modules/install-server/files/reprepro/incoming A modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/boot.txt A modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 A modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 A modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 A modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS1-115200 A modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS1-57600 A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/adtxt.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/exithelp.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f1.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f10.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f2.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f3.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f4.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f5.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f6.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f7.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f8.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/f9.txt A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/menu.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/prompt.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/rqtxt.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/splash.png A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/stdmenu.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/syslinux.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/txt.cfg A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/boot-screens/vesamenu.c32 A modules/install-server/files/tftpboot/trusty-installer/ubuntu-installer/amd64/pxelinux.cfg/default A modules/install-server/files/tftpboot/trusty-installer/version.info 30 files changed, 400 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/65/112465/1 diff --git a/modules/install-server/files/reprepro/distributions b/modules/install-server/files/reprepro/distributions index 73aa533..353aeaa 100644 --- a/modules/install-server/files/reprepro/distributions +++ b/modules/install-server/files/reprepro/distributions @@ -56,3 +56,18 @@ DebOverride: deb-override Log: log + +Origin: Wikimedia +Label: Wikimedia +Suite: trusty-wikimedia +Codename: trusty-wikimedia +Version: 14.04 +Architectures: source amd64 +Components: main universe non-free +UDebComponents: main +Update: hwraid +Description: Wikimedia specific packages for Ubuntu Trusty Tahr +SignWith: default +DebOverride: deb-override +Log: + log diff --git a/modules/install-server/files/reprepro/incoming b/modules/install-server/files/reprepro/incoming index d0a74d8..c544479 100644 --- a/modules/install-server/files/reprepro/incoming +++ b/modules/install-server/files/reprepro/incoming @@ -1,4 +1,4 @@ Name: default IncomingDir: incoming TempDir: /tmp -Allow: hardy-wikimedia karmic-wikimedia lucid-wikimedia lucid-wikimedia-mysql hardyhardy-wikimedia karmickarmic-wikimedia lucidlucid-wikimedia preciseprecise-wikimedia +Allow: hardy-wikimedia lucid-wikimedia lucid-wikimedia-mysql precise-wikimedia trusty-wikimedia hardyhardy-wikimedia lucidlucid-wikimedia preciseprecise-wikimedia trustytrusty-wikimedia diff --git a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/boot.txt b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/boot.txt new file mode 100644 index 000..adfdfbd ---
[MediaWiki-commits] [Gerrit] Switch copper to Ubuntu trusty - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Switch copper to Ubuntu trusty
..
Switch copper to Ubuntu trusty
copper is a Swift test/replication host; we can safely use it for such
experiments.
Change-Id: I6ee51feb48187629aeae2ac904245b65e97fc13b
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 0810ee8..e332864 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -337,6 +337,9 @@
host copper {
hardware ethernet 78:2b:cb:09:0e:9d;
fixed-address copper.eqiad.wmnet;
+
+ option pxelinux.pathprefix trusty-installer/;
+ filename trusty-installer/ubuntu-installer/amd64/pxelinux.0;
}
host cp1037 {
--
To view, visit https://gerrit.wikimedia.org/r/112466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ee51feb48187629aeae2ac904245b65e97fc13b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: disable biosdevname on trusty - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: install-server: disable biosdevname on trusty .. install-server: disable biosdevname on trusty trusty wants to name devices using Dell's biosdevname (they call it consistent naming) in Dell servers and hence the primary embedded network card would get a name of em1. This breaks our early_command, and while we could fix that, it's better to stay consistent with our old naming for now to help with server reinstalls and other changes across the board (interface:: definitions etc.). Set biosdevname=0 in the installer's kernel command-line to revert to the old behavior per https://lists.ubuntu.com/archives/ubuntu-devel/2012-August/035670.html Change-Id: I753123e54df70ce8777c7e08a79fcc4c79f490c9 --- M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS1-115200 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS1-57600 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 index 3122a5d..c1060ec 100644 --- a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 +++ b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 @@ -9,4 +9,4 @@ LABEL server kernel ubuntu-installer/amd64/linux - append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,115200n8 + append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal biosdevname=0 initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,115200n8 diff --git a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 index 635a989..1f298de 100644 --- a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 +++ b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 @@ -9,4 +9,4 @@ LABEL server kernel ubuntu-installer/amd64/linux - append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,57600n8 + append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal biosdevname=0 initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,57600n8 diff --git a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 index da8aebb..21be1ec 100644 --- a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 +++ b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 @@ -9,4 +9,4 @@ LABEL server kernel ubuntu-installer/amd64/linux - append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,9600n8 + append
[MediaWiki-commits] [Gerrit] install-server: disable biosdevname on trusty - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112475 Change subject: install-server: disable biosdevname on trusty .. install-server: disable biosdevname on trusty trusty wants to name devices using Dell's biosdevname (they call it consistent naming) in Dell servers and hence the primary embedded network card would get a name of em1. This breaks our early_command, and while we could fix that, it's better to stay consistent with our old naming for now to help with server reinstalls and other changes across the board (interface:: definitions etc.). Set biosdevname=0 in the installer's kernel command-line to revert to the old behavior per https://lists.ubuntu.com/archives/ubuntu-devel/2012-August/035670.html Change-Id: I753123e54df70ce8777c7e08a79fcc4c79f490c9 --- M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS1-115200 M modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS1-57600 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/75/112475/1 diff --git a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 index 3122a5d..c1060ec 100644 --- a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 +++ b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-115200 @@ -9,4 +9,4 @@ LABEL server kernel ubuntu-installer/amd64/linux - append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,115200n8 + append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal biosdevname=0 initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,115200n8 diff --git a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 index 635a989..1f298de 100644 --- a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 +++ b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-57600 @@ -9,4 +9,4 @@ LABEL server kernel ubuntu-installer/amd64/linux - append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,57600n8 + append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal biosdevname=0 initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 -- console=ttyS0,57600n8 diff --git a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 index da8aebb..21be1ec 100644 --- a/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 +++ b/modules/install-server/files/tftpboot/trusty-installer/pxelinux.cfg/ttyS0-9600 @@ -9,4 +9,4 @@ LABEL server kernel ubuntu-installer/amd64/linux - append debian-installer/locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layout=English (US) keyboard-configuration/variant=English (US) vga=normal initrd=ubuntu-installer/amd64/initrd.gz preseed/url=http://apt.wikimedia.org/autoinstall/preseed.cfg DEBCONF_DEBUG=5 netcfg/choose_interface=auto netcfg/get_hostname=unassigned netcfg/dhcp_timeout=60 --
[MediaWiki-commits] [Gerrit] install-server: fix late_command for trusty - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: install-server: fix late_command for trusty
..
install-server: fix late_command for trusty
Remove wikimedia-base from the packages that late_command (
standard-pacakges) installs. While it's easy to copy it from precise,
it's also a useless package as the only thing that it actually does is
to depend on openssh-server, which we install anyway.
Make the ixgbe-dkms package installation conditional on the version of
the module itself, as our ixgbe patch is not needed in recent kernels
(incl. trusty). While this did no fail on the test system, it would fail
on systems that actually have ixgbe, since we don't (nor plan to have)
ixgbe-dkms on trusty.
Change-Id: I47d40e31fb715972ce045382d290317a9c602361
---
M modules/base/manifests/standard-packages.pp
M modules/install-server/files/autoinstall/scripts/late_command
2 files changed, 5 insertions(+), 6 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/standard-packages.pp
b/modules/base/manifests/standard-packages.pp
index ae65c19..4deb8f8 100644
--- a/modules/base/manifests/standard-packages.pp
+++ b/modules/base/manifests/standard-packages.pp
@@ -1,7 +1,6 @@
class base::standard-packages {
$packages = [
-'wikimedia-base',
'wipe',
'tzdata',
'zsh-beta',
diff --git a/modules/install-server/files/autoinstall/scripts/late_command
b/modules/install-server/files/autoinstall/scripts/late_command
index e74bc64..7b733fd 100644
--- a/modules/install-server/files/autoinstall/scripts/late_command
+++ b/modules/install-server/files/autoinstall/scripts/late_command
@@ -8,9 +8,9 @@
wget -O /target/root/.ssh/authorized_keys
http://apt.wikimedia.org/autoinstall/ssh/authorized_keys
chmod go-rwx /target/root/.ssh/authorized_keys
-# Install wikimedia-base which pulls in a lot of other stuff, and
-# openssh-server just to be sure
-apt-install wikimedia-base openssh-server puppet
+# install openssh-server to make the machine accessible
+# and puppet because we'll need it soon anyway
+apt-install openssh-server puppet
# Change /etc/motd to read the auto-install date
chroot /target /bin/sh -c 'echo $(cat /etc/issue.net) auto-installed on
$(date). /etc/motd.tail'
@@ -18,7 +18,7 @@
# Disable IPv6 privacy extensions before the first boot
[ -f /target/etc/sysctl.d/10-ipv6-privacy.conf ] rm -f
/target/etc/sysctl.d/10-ipv6-privacy.conf
-# Install patched intel ixgbe kernel module
-if [ -d /sys/module/ixgbe ]; then
+# Install patched intel ixgbe kernel module (precise only)
+if grep -qs '3\.6' /sys/module/ixgbe/version; then
apt-install ixgbe-dkms
fi
--
To view, visit https://gerrit.wikimedia.org/r/112482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47d40e31fb715972ce045382d290317a9c602361
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: fix late_command for trusty - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112482 Change subject: install-server: fix late_command for trusty .. install-server: fix late_command for trusty Remove wikimedia-base from the packages that late_command ( standard-pacakges) installs. While it's easy to copy it from precise, it's also a useless package as the only thing that it actually does is to depend on openssh-server, which we install anyway. Make the ixgbe-dkms package installation conditional on the version of the module itself, as our ixgbe patch is not needed in recent kernels (incl. trusty). While this did no fail on the test system, it would fail on systems that actually have ixgbe, since we don't (nor plan to have) ixgbe-dkms on trusty. Change-Id: I47d40e31fb715972ce045382d290317a9c602361 --- M modules/install-server/files/autoinstall/scripts/late_command 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/82/112482/1 diff --git a/modules/install-server/files/autoinstall/scripts/late_command b/modules/install-server/files/autoinstall/scripts/late_command index e74bc64..7b733fd 100644 --- a/modules/install-server/files/autoinstall/scripts/late_command +++ b/modules/install-server/files/autoinstall/scripts/late_command @@ -8,9 +8,9 @@ wget -O /target/root/.ssh/authorized_keys http://apt.wikimedia.org/autoinstall/ssh/authorized_keys chmod go-rwx /target/root/.ssh/authorized_keys -# Install wikimedia-base which pulls in a lot of other stuff, and -# openssh-server just to be sure -apt-install wikimedia-base openssh-server puppet +# install openssh-server to make the machine accessible +# and puppet because we'll need it soon anyway +apt-install openssh-server puppet # Change /etc/motd to read the auto-install date chroot /target /bin/sh -c 'echo $(cat /etc/issue.net) auto-installed on $(date). /etc/motd.tail' @@ -18,7 +18,7 @@ # Disable IPv6 privacy extensions before the first boot [ -f /target/etc/sysctl.d/10-ipv6-privacy.conf ] rm -f /target/etc/sysctl.d/10-ipv6-privacy.conf -# Install patched intel ixgbe kernel module -if [ -d /sys/module/ixgbe ]; then +# Install patched intel ixgbe kernel module (precise only) +if grep -qs '3\.6' /sys/module/ixgbe/version; then apt-install ixgbe-dkms fi -- To view, visit https://gerrit.wikimedia.org/r/112482 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47d40e31fb715972ce045382d290317a9c602361 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] reprepro: add i386 to trusty - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112484 Change subject: reprepro: add i386 to trusty .. reprepro: add i386 to trusty While we don't expect to ever install an i386 server anymore, trusty comes with multiarch enabled by default and it complains if it doesn't find it. Rather than use deb [arch=amd64] all over the place, create an empty i386 repository instead. Change-Id: I1ac4d4862af14d92555b24b0be61339462e0b6a4 --- M modules/install-server/files/reprepro/distributions 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/84/112484/1 diff --git a/modules/install-server/files/reprepro/distributions b/modules/install-server/files/reprepro/distributions index 353aeaa..1016631 100644 --- a/modules/install-server/files/reprepro/distributions +++ b/modules/install-server/files/reprepro/distributions @@ -62,7 +62,7 @@ Suite: trusty-wikimedia Codename: trusty-wikimedia Version: 14.04 -Architectures: source amd64 +Architectures: source amd64 i386 Components: main universe non-free UDebComponents: main Update: hwraid -- To view, visit https://gerrit.wikimedia.org/r/112484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ac4d4862af14d92555b24b0be61339462e0b6a4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] reprepro: add i386 to trusty - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: reprepro: add i386 to trusty .. reprepro: add i386 to trusty While we don't expect to ever install an i386 server anymore, trusty comes with multiarch enabled by default and it complains if it doesn't find it. Rather than use deb [arch=amd64] all over the place, create an empty i386 repository instead. Change-Id: I1ac4d4862af14d92555b24b0be61339462e0b6a4 --- M modules/install-server/files/reprepro/distributions 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/install-server/files/reprepro/distributions b/modules/install-server/files/reprepro/distributions index 353aeaa..1016631 100644 --- a/modules/install-server/files/reprepro/distributions +++ b/modules/install-server/files/reprepro/distributions @@ -62,7 +62,7 @@ Suite: trusty-wikimedia Codename: trusty-wikimedia Version: 14.04 -Architectures: source amd64 +Architectures: source amd64 i386 Components: main universe non-free UDebComponents: main Update: hwraid -- To view, visit https://gerrit.wikimedia.org/r/112484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ac4d4862af14d92555b24b0be61339462e0b6a4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] salt: remove pinning to specific package version - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112485
Change subject: salt: remove pinning to specific package version
..
salt: remove pinning to specific package version
The backport scheme fails when we actually use distribution packages
(e.g. trusty has 0.17.5+ds-1). Pinning to a specific version from puppet
is not great either, so remove and rely on a plain installed instead.
Change-Id: Id21cde62ba620184d08ec8540118a43dd2e63db4
---
M manifests/role/salt.pp
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/112485/1
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 3b30486..2095484 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -7,7 +7,6 @@
$salt_returner_roots = {base=[/srv/salt/_returners]}
class { salt::master:
- salt_version= 0.17.1-1${lsbdistcodename},
salt_runner_dirs= [/srv/runners],
salt_peer_run = {
tin.eqiad.wmnet = ['deploy.*'],
@@ -36,7 +35,6 @@
$salt_returner_roots = {base=[/srv/salt/_returners]}
class { salt::master:
- salt_version= 0.17.1-1${lsbdistcodename},
salt_runner_dirs= [/srv/runners],
salt_peer_run = {
i-0390.pmtpa.wmflabs = ['deploy.*'],
@@ -76,7 +74,6 @@
$salt_returner_roots = {base=[/srv/salt/_returners]}
class { salt::master:
- salt_version= 0.17.1-1${lsbdistcodename},
salt_runner_dirs= [/srv/runners],
salt_peer_run = {
i-0822.pmtpa.wmflabs = ['deploy.*'],
@@ -140,7 +137,6 @@
}
class { salt::minion:
- salt_version = 0.17.1-1${lsbdistcodename},
salt_master= $salt_master,
salt_client_id = $salt_client_id,
salt_grains= $salt_grains,
--
To view, visit https://gerrit.wikimedia.org/r/112485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id21cde62ba620184d08ec8540118a43dd2e63db4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ssh: use provider = 'upstart' - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112486
Change subject: ssh: use provider = 'upstart'
..
ssh: use provider = 'upstart'
Apparently, on trusty, the behavior of the init.d SSH script has
changed, and instead of shelling out to /lib/init/upstart-job when
upstart is detected, it exits 1 instead on both status start
actions. Use provider = upstart instead, to make puppet use upstart
directly.
Change-Id: Ifb657c76c1b0d127acb262eee887d20d5919ba31
---
M modules/ssh/manifests/server.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/112486/1
diff --git a/modules/ssh/manifests/server.pp b/modules/ssh/manifests/server.pp
index 8a544f6..f0dd064 100644
--- a/modules/ssh/manifests/server.pp
+++ b/modules/ssh/manifests/server.pp
@@ -6,6 +6,7 @@
service { 'ssh':
ensure= running,
subscribe = File['/etc/ssh/sshd_config'];
+provider = 'upstart',
}
if ($::realm == 'labs') {
--
To view, visit https://gerrit.wikimedia.org/r/112486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb657c76c1b0d127acb262eee887d20d5919ba31
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] salt: remove pinning to specific package version - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: salt: remove pinning to specific package version
..
salt: remove pinning to specific package version
The backport scheme fails when we actually use distribution packages
(e.g. trusty has 0.17.5+ds-1). Pinning to a specific version from puppet
is not great either, so remove and rely on a plain installed instead.
Change-Id: Id21cde62ba620184d08ec8540118a43dd2e63db4
---
M manifests/role/salt.pp
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 3b30486..2095484 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -7,7 +7,6 @@
$salt_returner_roots = {base=[/srv/salt/_returners]}
class { salt::master:
- salt_version= 0.17.1-1${lsbdistcodename},
salt_runner_dirs= [/srv/runners],
salt_peer_run = {
tin.eqiad.wmnet = ['deploy.*'],
@@ -36,7 +35,6 @@
$salt_returner_roots = {base=[/srv/salt/_returners]}
class { salt::master:
- salt_version= 0.17.1-1${lsbdistcodename},
salt_runner_dirs= [/srv/runners],
salt_peer_run = {
i-0390.pmtpa.wmflabs = ['deploy.*'],
@@ -76,7 +74,6 @@
$salt_returner_roots = {base=[/srv/salt/_returners]}
class { salt::master:
- salt_version= 0.17.1-1${lsbdistcodename},
salt_runner_dirs= [/srv/runners],
salt_peer_run = {
i-0822.pmtpa.wmflabs = ['deploy.*'],
@@ -140,7 +137,6 @@
}
class { salt::minion:
- salt_version = 0.17.1-1${lsbdistcodename},
salt_master= $salt_master,
salt_client_id = $salt_client_id,
salt_grains= $salt_grains,
--
To view, visit https://gerrit.wikimedia.org/r/112485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id21cde62ba620184d08ec8540118a43dd2e63db4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ssh: use provider = 'upstart' - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: ssh: use provider = 'upstart'
..
ssh: use provider = 'upstart'
Apparently, on trusty, the behavior of the init.d SSH script has
changed, and instead of shelling out to /lib/init/upstart-job when
upstart is detected, it exits 1 instead on both status start
actions. Use provider = upstart instead, to make puppet use upstart
directly.
Change-Id: Ifb657c76c1b0d127acb262eee887d20d5919ba31
---
M modules/ssh/manifests/server.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ssh/manifests/server.pp b/modules/ssh/manifests/server.pp
index 8a544f6..dc1db63 100644
--- a/modules/ssh/manifests/server.pp
+++ b/modules/ssh/manifests/server.pp
@@ -5,7 +5,8 @@
service { 'ssh':
ensure= running,
-subscribe = File['/etc/ssh/sshd_config'];
+subscribe = File['/etc/ssh/sshd_config'],
+provider = 'upstart',
}
if ($::realm == 'labs') {
--
To view, visit https://gerrit.wikimedia.org/r/112486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb657c76c1b0d127acb262eee887d20d5919ba31
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: allow /sbin/ip for early_command - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112489 Change subject: install-server: allow /sbin/ip for early_command .. install-server: allow /sbin/ip for early_command ip is installed under /sbin in at least trusty installers (and precise trusty systems). Leave /bin/ip as an alternative, just in case the older releases need it. This currently breaks trusty, as trusty installer has no ifconfig to fall back to at all. Change-Id: I0c4c9648802fe42cf44a4330cc9015b5d614b60c --- M modules/install-server/files/autoinstall/scripts/early_command 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/89/112489/1 diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index 7a3981e..f7004db 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -3,8 +3,9 @@ set -e set -x -# Redo network configuration statically -if [ -x /bin/ip ]; then +# redo network configuration statically +# at least trusty has ip under /sbin +if [ -x /sbin/ip -o -x /bin/ip ]; then IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' -f 6 | cut -d '/' -f 1) else IP=$(ifconfig | grep inet addr | cut -d ' ' -f 12 | sed 's/addr://' | grep -v 127\.0\.0\.1) -- To view, visit https://gerrit.wikimedia.org/r/112489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c4c9648802fe42cf44a4330cc9015b5d614b60c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: allow /sbin/ip for early_command - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: install-server: allow /sbin/ip for early_command .. install-server: allow /sbin/ip for early_command ip is installed under /sbin in at least trusty installers (and precise trusty systems). Leave /bin/ip as an alternative, just in case the older releases need it. This currently breaks trusty, as trusty installer has no ifconfig to fall back to at all. Change-Id: I0c4c9648802fe42cf44a4330cc9015b5d614b60c --- M modules/install-server/files/autoinstall/scripts/early_command 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index 7a3981e..f7004db 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -3,8 +3,9 @@ set -e set -x -# Redo network configuration statically -if [ -x /bin/ip ]; then +# redo network configuration statically +# at least trusty has ip under /sbin +if [ -x /sbin/ip -o -x /bin/ip ]; then IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' -f 6 | cut -d '/' -f 1) else IP=$(ifconfig | grep inet addr | cut -d ' ' -f 12 | sed 's/addr://' | grep -v 127\.0\.0\.1) -- To view, visit https://gerrit.wikimedia.org/r/112489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c4c9648802fe42cf44a4330cc9015b5d614b60c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: another trusty early_command fix - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112685 Change subject: autoinstall: another trusty early_command fix .. autoinstall: another trusty early_command fix killall.sh for killing DHCP was (rightfully) renamed to kill-all-dhcp to indicate its purpose in netcfg 1.86. wheezy has 1.108 trusty has 1.114 and are the first versions to have this change. Add support for in a backwards-compatible way and while at it, remove a useless true invocation. Change-Id: I282f8e2d7187e98b8e544335baba9501463b7570 --- M modules/install-server/files/autoinstall/scripts/early_command 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/85/112685/1 diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index f7004db..a9cea29 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -4,6 +4,7 @@ set -x # redo network configuration statically + # at least trusty has ip under /sbin if [ -x /sbin/ip -o -x /bin/ip ]; then IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' -f 6 | cut -d '/' -f 1) @@ -13,7 +14,8 @@ echo d-i netcfg/get_ipaddress string $IP /tmp/static_net.cfg debconf-set-selections /tmp/static_net.cfg -killall.sh; netcfg; true +# kill-all-dhcp is = wheezy/trusty (netcfg 1.86) +killall.sh || kill-all-dhcp; netcfg # Preseed the correct wikimedia repository location SUITE=$(debconf-get mirror/suite) -- To view, visit https://gerrit.wikimedia.org/r/112685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I282f8e2d7187e98b8e544335baba9501463b7570 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: disable multiarch by default - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112687 Change subject: autoinstall: disable multiarch by default .. autoinstall: disable multiarch by default multiarch is set to i386 on amd64 systems by default since apt-setup 1:0.79, i.e. Ubuntu saucy. We don't need it, so disable it. Change-Id: Id2c4d52617a05776c40dcc900dda4125e06e6b6d --- M modules/install-server/files/autoinstall/common.cfg 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/112687/1 diff --git a/modules/install-server/files/autoinstall/common.cfg b/modules/install-server/files/autoinstall/common.cfg index 0fda1f0..d8cf8ad 100644 --- a/modules/install-server/files/autoinstall/common.cfg +++ b/modules/install-server/files/autoinstall/common.cfg @@ -43,6 +43,9 @@ d-imirror/http/directory string /ubuntu/ d-imirror/http/proxy string +# disable multiarch, enabled by default in amd64 since saucy +d-iapt-setup/multiarch string + # Wikimedia's APT repository d-iapt-setup/local0/commentstring Wikimedia APT repository d-iapt-setup/local0/source boolean true -- To view, visit https://gerrit.wikimedia.org/r/112687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2c4d52617a05776c40dcc900dda4125e06e6b6d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: set up apt pinning from early in d-i - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112688 Change subject: autoinstall: set up apt pinning from early in d-i .. autoinstall: set up apt pinning from early in d-i We currently have the need that we need to install a lower version of puppet (2.7 instead of 3.4) from our own apt repository in trusty, but we have no apt pinning set up while in the installer, and hence when both are set at 500, the highest version wins. Unfortunately, apt-setup does not support setting up apt pinning and both early_command late_command are unsuitable for doing so (the former runs before we have /target, the latter runs after apt-get update has been run). Work around this in a very hacky way, by having the early_command shell script install a shell script hook under base-installer's prehooks runpartsdir, which runs before the apt_update step. It also runs before the install_base_system step and there's no hook step between those two, but this should be okay as long as we mkdir /etc/apt/preferences.d ourselves. Change-Id: I6dcb9d340aa54f52cdb96ef3cbcc51628e4001d9 --- M modules/install-server/files/autoinstall/scripts/early_command 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/88/112688/1 diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index 726c1be..6b080d2 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -29,3 +29,21 @@ SUITE=$(debconf-get mirror/suite) echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main universe non-free /tmp/apt_repository.cfg debconf-set-selections /tmp/apt_repository.cfg + +# apt-setup doesn't allow us to set up pinning and hence everything we install +# with apt-install bypasses pinning. hack around this by creating a +# base-installer early hook that does this right before apt-get update +cat /usr/lib/base-installer.d/10aptpinning EOF +#!/bin/sh +set -e + +APT_PREFDIR=/target/etc/apt/preferences.d +[ ! -d \$APT_PREFDIR ] mkdir -p \$APT_PREFDIR + +cat \$APT_PREFDIR/wikimedia EOT +Package: * +Pin: release o=Wikimedia +Pin-Priority: 1001 +EOT +EOF +chmod +x /usr/lib/base-installer.d/10aptpinning -- To view, visit https://gerrit.wikimedia.org/r/112688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6dcb9d340aa54f52cdb96ef3cbcc51628e4001d9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: move disable_dhcp to early_command - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112686 Change subject: autoinstall: move disable_dhcp to early_command .. autoinstall: move disable_dhcp to early_command There is no reason for the disable_dhcp/disable_autoconfig boilerplate to be present in every single subnet definition where it can be moved in the place where we actually set the static IP address and call netcfg itself. This has the downside that it to a shell script, but it has the benefit of DRY, plus that we can document all netcfg exceptions. While at it, remove the netcfg/choose_interface setting from a couple of subnets, as it's defined in common.cfg anyway. Change-Id: I72681530ab76211e96a45ee46acb6e2b177e36e4 --- M modules/install-server/files/autoinstall/scripts/early_command M modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg M modules/install-server/files/autoinstall/subnets/analytics1-c-eqiad.cfg M modules/install-server/files/autoinstall/subnets/esams.cfg M modules/install-server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg M modules/install-server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg M modules/install-server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg M modules/install-server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-internal.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-pub-svc2.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-squid.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-virt.cfg M modules/install-server/files/autoinstall/subnets/pmtpa.cfg M modules/install-server/files/autoinstall/subnets/private1-a-eqiad.cfg M modules/install-server/files/autoinstall/subnets/private1-b-eqiad.cfg M modules/install-server/files/autoinstall/subnets/private1-c-eqiad.cfg M modules/install-server/files/autoinstall/subnets/private1-d-eqiad.cfg M modules/install-server/files/autoinstall/subnets/private1-ulsfo.cfg M modules/install-server/files/autoinstall/subnets/public1-a-eqiad.cfg M modules/install-server/files/autoinstall/subnets/public1-b-eqiad.cfg M modules/install-server/files/autoinstall/subnets/public1-ulsfo.cfg M modules/install-server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg 22 files changed, 13 insertions(+), 95 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/86/112686/1 diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index a9cea29..726c1be 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -3,8 +3,7 @@ set -e set -x -# redo network configuration statically - +## redo network configuration statically # at least trusty has ip under /sbin if [ -x /sbin/ip -o -x /bin/ip ]; then IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' -f 6 | cut -d '/' -f 1) @@ -12,12 +11,21 @@ IP=$(ifconfig | grep inet addr | cut -d ' ' -f 12 | sed 's/addr://' | grep -v 127\.0\.0\.1) fi -echo d-i netcfg/get_ipaddress string $IP /tmp/static_net.cfg +# netcfg backwards-compatible notes: +# - disable_autoconfig is needed for = precise +# - disable_dhcp is supported but deprecated in favor of disable_autoconfig +# starting with netcfg 1.101 (wheezy/trusty) +# - kill-all-dhcp has replaced killall.sh since netcfg 1.86 (= wheezy/trusty) + +cat /tmp/static_net.cfg EOF +d-i netcfg/get_ipaddress string $IP +d-i netcfg/disable_dhcp boolean true +d-i netcfg/disable_autoconfig boolean true +EOF debconf-set-selections /tmp/static_net.cfg -# kill-all-dhcp is = wheezy/trusty (netcfg 1.86) killall.sh || kill-all-dhcp; netcfg -# Preseed the correct wikimedia repository location +## preseed the correct wikimedia repository location SUITE=$(debconf-get mirror/suite) echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main universe non-free /tmp/apt_repository.cfg debconf-set-selections /tmp/apt_repository.cfg diff --git a/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg b/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg index a93035b..9245bd6 100644 --- a/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg +++ b/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg @@ -3,10 +3,6 @@ # get_domain should be set, get_hostname is overwritten by DHCP d-inetcfg/get_domain string eqiad.wmnet -# disable_dhcp for lucid, disable_autoconfig for = precise -d-inetcfg/disable_dhcp boolean true -d-inetcfg/disable_autoconfig boolean true - # ip address is taken from DHCP, rest is set here d-inetcfg/get_netmask string 255.255.255.0 d-inetcfg/get_gateway
[MediaWiki-commits] [Gerrit] autoinstall: another trusty early_command fix - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: another trusty early_command fix .. autoinstall: another trusty early_command fix killall.sh for killing DHCP was (rightfully) renamed to kill-all-dhcp to indicate its purpose in netcfg 1.86. wheezy has 1.108 trusty has 1.114 and are the first versions to have this change. Add support for in a backwards-compatible way and while at it, remove a useless true invocation. Change-Id: I282f8e2d7187e98b8e544335baba9501463b7570 --- M modules/install-server/files/autoinstall/scripts/early_command 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index f7004db..a9cea29 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -4,6 +4,7 @@ set -x # redo network configuration statically + # at least trusty has ip under /sbin if [ -x /sbin/ip -o -x /bin/ip ]; then IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' -f 6 | cut -d '/' -f 1) @@ -13,7 +14,8 @@ echo d-i netcfg/get_ipaddress string $IP /tmp/static_net.cfg debconf-set-selections /tmp/static_net.cfg -killall.sh; netcfg; true +# kill-all-dhcp is = wheezy/trusty (netcfg 1.86) +killall.sh || kill-all-dhcp; netcfg # Preseed the correct wikimedia repository location SUITE=$(debconf-get mirror/suite) -- To view, visit https://gerrit.wikimedia.org/r/112685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I282f8e2d7187e98b8e544335baba9501463b7570 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: disable multiarch by default - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: disable multiarch by default .. autoinstall: disable multiarch by default multiarch is set to i386 on amd64 systems by default since apt-setup 1:0.79, i.e. Ubuntu saucy. We don't need it, so disable it. Change-Id: Id2c4d52617a05776c40dcc900dda4125e06e6b6d --- M modules/install-server/files/autoinstall/common.cfg 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/common.cfg b/modules/install-server/files/autoinstall/common.cfg index 0fda1f0..d8cf8ad 100644 --- a/modules/install-server/files/autoinstall/common.cfg +++ b/modules/install-server/files/autoinstall/common.cfg @@ -43,6 +43,9 @@ d-imirror/http/directory string /ubuntu/ d-imirror/http/proxy string +# disable multiarch, enabled by default in amd64 since saucy +d-iapt-setup/multiarch string + # Wikimedia's APT repository d-iapt-setup/local0/commentstring Wikimedia APT repository d-iapt-setup/local0/source boolean true -- To view, visit https://gerrit.wikimedia.org/r/112687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id2c4d52617a05776c40dcc900dda4125e06e6b6d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: set up apt pinning from early in d-i - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: set up apt pinning from early in d-i .. autoinstall: set up apt pinning from early in d-i We currently have the need that we need to install a lower version of puppet (2.7 instead of 3.4) from our own apt repository in trusty, but we have no apt pinning set up while in the installer, and hence when both are set at 500, the highest version wins. Unfortunately, apt-setup does not support setting up apt pinning and both early_command late_command are unsuitable for doing so (the former runs before we have /target, the latter runs after apt-get update has been run). Work around this in a very hacky way, by having the early_command shell script install a shell script hook under base-installer's prehooks runpartsdir, which runs before the apt_update step. It also runs before the install_base_system step and there's no hook step between those two, but this should be okay as long as we mkdir /etc/apt/preferences.d ourselves. Change-Id: I6dcb9d340aa54f52cdb96ef3cbcc51628e4001d9 --- M modules/install-server/files/autoinstall/scripts/early_command 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index 726c1be..6b080d2 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -29,3 +29,21 @@ SUITE=$(debconf-get mirror/suite) echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main universe non-free /tmp/apt_repository.cfg debconf-set-selections /tmp/apt_repository.cfg + +# apt-setup doesn't allow us to set up pinning and hence everything we install +# with apt-install bypasses pinning. hack around this by creating a +# base-installer early hook that does this right before apt-get update +cat /usr/lib/base-installer.d/10aptpinning EOF +#!/bin/sh +set -e + +APT_PREFDIR=/target/etc/apt/preferences.d +[ ! -d \$APT_PREFDIR ] mkdir -p \$APT_PREFDIR + +cat \$APT_PREFDIR/wikimedia EOT +Package: * +Pin: release o=Wikimedia +Pin-Priority: 1001 +EOT +EOF +chmod +x /usr/lib/base-installer.d/10aptpinning -- To view, visit https://gerrit.wikimedia.org/r/112688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6dcb9d340aa54f52cdb96ef3cbcc51628e4001d9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] autoinstall: move disable_dhcp to early_command - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: autoinstall: move disable_dhcp to early_command .. autoinstall: move disable_dhcp to early_command There is no reason for the disable_dhcp/disable_autoconfig boilerplate to be present in every single subnet definition where it can be moved in the place where we actually set the static IP address and call netcfg itself. This has the downside that it to a shell script, but it has the benefit of DRY, plus that we can document all netcfg exceptions. While at it, remove the netcfg/choose_interface setting from a couple of subnets, as it's defined in common.cfg anyway. Change-Id: I72681530ab76211e96a45ee46acb6e2b177e36e4 --- M modules/install-server/files/autoinstall/scripts/early_command M modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg M modules/install-server/files/autoinstall/subnets/analytics1-c-eqiad.cfg M modules/install-server/files/autoinstall/subnets/esams.cfg M modules/install-server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg M modules/install-server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg M modules/install-server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg M modules/install-server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-internal.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-pub-svc2.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-squid.cfg M modules/install-server/files/autoinstall/subnets/pmtpa-virt.cfg M modules/install-server/files/autoinstall/subnets/pmtpa.cfg M modules/install-server/files/autoinstall/subnets/private1-a-eqiad.cfg M modules/install-server/files/autoinstall/subnets/private1-b-eqiad.cfg M modules/install-server/files/autoinstall/subnets/private1-c-eqiad.cfg M modules/install-server/files/autoinstall/subnets/private1-d-eqiad.cfg M modules/install-server/files/autoinstall/subnets/private1-ulsfo.cfg M modules/install-server/files/autoinstall/subnets/public1-a-eqiad.cfg M modules/install-server/files/autoinstall/subnets/public1-b-eqiad.cfg M modules/install-server/files/autoinstall/subnets/public1-ulsfo.cfg M modules/install-server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg 22 files changed, 13 insertions(+), 95 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/scripts/early_command b/modules/install-server/files/autoinstall/scripts/early_command index a9cea29..726c1be 100644 --- a/modules/install-server/files/autoinstall/scripts/early_command +++ b/modules/install-server/files/autoinstall/scripts/early_command @@ -3,8 +3,7 @@ set -e set -x -# redo network configuration statically - +## redo network configuration statically # at least trusty has ip under /sbin if [ -x /sbin/ip -o -x /bin/ip ]; then IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' ' -f 6 | cut -d '/' -f 1) @@ -12,12 +11,21 @@ IP=$(ifconfig | grep inet addr | cut -d ' ' -f 12 | sed 's/addr://' | grep -v 127\.0\.0\.1) fi -echo d-i netcfg/get_ipaddress string $IP /tmp/static_net.cfg +# netcfg backwards-compatible notes: +# - disable_autoconfig is needed for = precise +# - disable_dhcp is supported but deprecated in favor of disable_autoconfig +# starting with netcfg 1.101 (wheezy/trusty) +# - kill-all-dhcp has replaced killall.sh since netcfg 1.86 (= wheezy/trusty) + +cat /tmp/static_net.cfg EOF +d-i netcfg/get_ipaddress string $IP +d-i netcfg/disable_dhcp boolean true +d-i netcfg/disable_autoconfig boolean true +EOF debconf-set-selections /tmp/static_net.cfg -# kill-all-dhcp is = wheezy/trusty (netcfg 1.86) killall.sh || kill-all-dhcp; netcfg -# Preseed the correct wikimedia repository location +## preseed the correct wikimedia repository location SUITE=$(debconf-get mirror/suite) echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main universe non-free /tmp/apt_repository.cfg debconf-set-selections /tmp/apt_repository.cfg diff --git a/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg b/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg index a93035b..9245bd6 100644 --- a/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg +++ b/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg @@ -3,10 +3,6 @@ # get_domain should be set, get_hostname is overwritten by DHCP d-inetcfg/get_domain string eqiad.wmnet -# disable_dhcp for lucid, disable_autoconfig for = precise -d-inetcfg/disable_dhcp boolean true -d-inetcfg/disable_autoconfig boolean true - # ip address is taken from DHCP, rest is set here d-inetcfg/get_netmask string 255.255.255.0 d-inetcfg/get_gateway string 10.64.21.1 diff --git
[MediaWiki-commits] [Gerrit] base: remove initcwnd if-up.d hook for = oneiric - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112697
Change subject: base: remove initcwnd if-up.d hook for = oneiric
..
base: remove initcwnd if-up.d hook for = oneiric
We currently have an if-up.d hook to set the TCP initial congestion
window to 10*MSS on all boxes, but this is currently unneeded on all of
our recent boxes. Linux upstream made 10 the default with commit
442b9635c, which is included since 2.6.39, way before any of our precise
systems.
As checking for a running kernel is kind of evil, make the check
conditional to lsbdistcodename, and remove the if-up hook in everything
post-oneiric (natty = 2.6.38, oneiric = 3.0).
Change-Id: Idfe83887b5601fe1c02766ea6d7121a2bf516ef4
---
M modules/base/manifests/init.pp
1 file changed, 18 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/112697/1
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 96c4b6d..d3e36f0 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -360,18 +360,25 @@
class base::tcptweaks {
Class[base::puppet] - Class[base::tcptweaks]
-file { '/etc/network/if-up.d/initcwnd':
-ensure = present,
-content = template('base/initcwnd.erb'),
-mode= '0555',
-owner = 'root',
-group = 'root',
-}
+# unneeded since Linux 2.6.39, i.e. Ubuntu 11.10 Oneiric Ocelot
+if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '11.10') 0
{
+file { '/etc/network/if-up.d/initcwnd':
+ensure = present,
+content = template('base/initcwnd.erb'),
+mode= '0555',
+owner = 'root',
+group = 'root',
+}
-exec { '/etc/network/if-up.d/initcwnd':
-require = File['/etc/network/if-up.d/initcwnd'],
-subscribe = File['/etc/network/if-up.d/initcwnd'],
-refreshonly = true,
+exec { '/etc/network/if-up.d/initcwnd':
+require = File['/etc/network/if-up.d/initcwnd'],
+subscribe = File['/etc/network/if-up.d/initcwnd'],
+refreshonly = true,
+}
+} else {
+file { '/etc/network/if-up.d/initcwnd':
+ensure = absent,
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/112697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfe83887b5601fe1c02766ea6d7121a2bf516ef4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] base: remove initcwnd if-up.d hook for = oneiric - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: base: remove initcwnd if-up.d hook for = oneiric
..
base: remove initcwnd if-up.d hook for = oneiric
We currently have an if-up.d hook to set the TCP initial congestion
window to 10*MSS on all boxes, but this is currently unneeded on all of
our recent boxes. Linux upstream made 10 the default with commit
442b9635c, which is included since 2.6.39, way before any of our precise
systems.
As checking for a running kernel is kind of evil, make the check
conditional to lsbdistcodename, and remove the if-up hook in everything
post-oneiric (natty = 2.6.38, oneiric = 3.0).
Change-Id: Idfe83887b5601fe1c02766ea6d7121a2bf516ef4
---
M modules/base/manifests/init.pp
1 file changed, 18 insertions(+), 11 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 96c4b6d..d3e36f0 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -360,18 +360,25 @@
class base::tcptweaks {
Class[base::puppet] - Class[base::tcptweaks]
-file { '/etc/network/if-up.d/initcwnd':
-ensure = present,
-content = template('base/initcwnd.erb'),
-mode= '0555',
-owner = 'root',
-group = 'root',
-}
+# unneeded since Linux 2.6.39, i.e. Ubuntu 11.10 Oneiric Ocelot
+if $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '11.10') 0
{
+file { '/etc/network/if-up.d/initcwnd':
+ensure = present,
+content = template('base/initcwnd.erb'),
+mode= '0555',
+owner = 'root',
+group = 'root',
+}
-exec { '/etc/network/if-up.d/initcwnd':
-require = File['/etc/network/if-up.d/initcwnd'],
-subscribe = File['/etc/network/if-up.d/initcwnd'],
-refreshonly = true,
+exec { '/etc/network/if-up.d/initcwnd':
+require = File['/etc/network/if-up.d/initcwnd'],
+subscribe = File['/etc/network/if-up.d/initcwnd'],
+refreshonly = true,
+}
+} else {
+file { '/etc/network/if-up.d/initcwnd':
+ensure = absent,
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/112697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idfe83887b5601fe1c02766ea6d7121a2bf516ef4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rsyslog: use provider = 'upstart' - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/112700 Change subject: rsyslog: use provider = 'upstart' .. rsyslog: use provider = 'upstart' Similarly to Ifb657c7, switch rsyslog to upstart as well, as it fails on trusty otherwise. Both this and the SSH one can be removed once we upgrade to a newer version of puppet, as puppet gained in a 2.7 point-release the line: defaultfor :operatingsystem = :ubuntu which we don't seem to have in precise's 2.7, nor do we have support for newer style upstart overrides. Change-Id: I688954780d0c642d9033a940d45584203c9c8369 --- M modules/base/manifests/init.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/00/112700/1 diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp index d3e36f0..084a269 100644 --- a/modules/base/manifests/init.pp +++ b/modules/base/manifests/init.pp @@ -296,6 +296,7 @@ ensure= running, require = Package['rsyslog'], subscribe = File['/etc/rsyslog.d/30-remote-syslog.conf'], +provivder = 'upstart', } } } -- To view, visit https://gerrit.wikimedia.org/r/112700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I688954780d0c642d9033a940d45584203c9c8369 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rsyslog: use provider = 'upstart' - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: rsyslog: use provider = 'upstart' .. rsyslog: use provider = 'upstart' Similarly to Ifb657c7, switch rsyslog to upstart as well, as it fails on trusty otherwise. Both this and the SSH one can be removed once we upgrade to a newer version of puppet, as puppet gained in a 2.7 point-release the line: defaultfor :operatingsystem = :ubuntu which we don't seem to have in precise's 2.7, nor do we have support for newer style upstart overrides. Change-Id: I688954780d0c642d9033a940d45584203c9c8369 --- M modules/base/manifests/init.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp index d3e36f0..4315acc 100644 --- a/modules/base/manifests/init.pp +++ b/modules/base/manifests/init.pp @@ -296,6 +296,7 @@ ensure= running, require = Package['rsyslog'], subscribe = File['/etc/rsyslog.d/30-remote-syslog.conf'], +provider = 'upstart', } } } -- To view, visit https://gerrit.wikimedia.org/r/112700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I688954780d0c642d9033a940d45584203c9c8369 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift: log_statsd_sample_rate_factor = 0.01 - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: swift: log_statsd_sample_rate_factor = 0.01
..
swift: log_statsd_sample_rate_factor = 0.01
make 'log_statsd_sample_rate_factor' configurable via puppet by making it a
parameter of swift::proxy, then set it to 0.01. it is drowning out everything
else on tungsten and makes it hard for me to debug things.
Change-Id: I00fc8e8cf204793a6d61376f752223a00b92170d
---
M manifests/role/swift.pp
M manifests/swift.pp
M templates/swift/proxy-server.conf.erb
3 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 8e08fe0..4ddd4e0 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -97,6 +97,7 @@
memcached_servers = [
ms-fe1001.eqiad.wmnet:11211, ms-fe1002.eqiad.wmnet:11211,
ms-fe1003.eqiad.wmnet:11211, ms-fe1004.eqiad.wmnet:11211 ],
statsd_host = '10.64.0.18', #
tungsten.eqiad.wmnet
statsd_metric_prefix =
swift.eqiad.${::hostname},
+ statsd_sample_rate_factor = 0.01,
auth_backend = 'tempauth',
super_admin_key =
$passwords::swift::eqiad-prod::super_admin_key,
rewrite_account = 'AUTH_mw',
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 827bdba..a0a3399 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -89,6 +89,7 @@
}
class swift::proxy(
+ $statsd_sample_rate_factor = 1,
$bind_port=8080,
$proxy_address,
$memcached_servers,
diff --git a/templates/swift/proxy-server.conf.erb
b/templates/swift/proxy-server.conf.erb
index e654c04..cb07340 100644
--- a/templates/swift/proxy-server.conf.erb
+++ b/templates/swift/proxy-server.conf.erb
@@ -6,10 +6,11 @@
user = swift
% if @statsd_host -%
log_statsd_host = %= @statsd_host %
-% end -%
+log_statsd_sample_rate_factor = %= @statsd_sample_rate_factor %
% if @statsd_metric_prefix -%
log_statsd_metric_prefix = %= @statsd_metric_prefix %
% end -%
+% end -%
[pipeline:main]
% if @auth_backend == 'swauth' -%
--
To view, visit https://gerrit.wikimedia.org/r/109054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00fc8e8cf204793a6d61376f752223a00b92170d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
