[MediaWiki-commits] [Gerrit] misc: add rutherfordium and point people.wm.o to it - change (operations/puppet)

2015-11-09 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: misc: add rutherfordium and point people.wm.o to it
..


misc: add rutherfordium and point people.wm.o to it

Adds rutherfordium.eqiad.wmnet as a new backend and point people.wm.o to it.
Also change the comment on terbium from public_html to noc.wm.o.

Bug: T116992
Change-Id: I7bc23224612ce18f6609f84c22c3a5eeaf263a5c
---
M modules/role/manifests/cache/misc.pp
M templates/varnish/misc.inc.vcl.erb
2 files changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/cache/misc.pp 
b/modules/role/manifests/cache/misc.pp
index b90fcc0..ffa2da0 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -125,12 +125,17 @@
 'type' => 'random',
 'backends' => ['ruthenium.eqiad.wmnet'],
 },
+'rutherfordium' => { # people.wikimedia.org
+'dynamic' => 'no',
+'type' => 'random',
+'backends' => ['rutherfordium.eqiad.wmnet'],
+},
 'stat1001' => { # metrics and metrics-api
 'dynamic' => 'no',
 'type' => 'random',
 'backends' => ['stat1001.eqiad.wmnet'],
 },
-'terbium' => { # public_html
+'terbium' => { # noc.wikimedia.org
 'dynamic' => 'no',
 'type' => 'random',
 'backends' => ['terbium.eqiad.wmnet'],
diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index 995a3ee..219e9e0 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -63,7 +63,7 @@
 // No caching of OTRS for now
 return (pass);
 } elsif (req.http.Host == "people.wikimedia.org") {
-set req.backend = terbium;
+set req.backend = rutherfordium;
 // No caching of public_html dirs
 return (pass);
 } elsif (req.http.Host == "racktables.wikimedia.org" || req.http.Host == 
"rt.wikimedia.org") {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bc23224612ce18f6609f84c22c3a5eeaf263a5c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] misc: add rutherfordium and point people.wm.o to it - change (operations/puppet)

2015-11-04 Thread John F. Lewis (Code Review) 
John F. Lewis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251115

Change subject: misc: add rutherfordium and point people.wm.o to it
..

misc: add rutherfordium and point people.wm.o to it

Adds rutherfordium.eqiad.wmnet as a new backend and point people.wm.o to it.
Also change the comment on terbium from public_html to noc.wm.o.

Bug: T116992
Change-Id: I7bc23224612ce18f6609f84c22c3a5eeaf263a5c
---
M modules/role/manifests/cache/misc.pp
M templates/varnish/misc.inc.vcl.erb
2 files changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/251115/1

diff --git a/modules/role/manifests/cache/misc.pp 
b/modules/role/manifests/cache/misc.pp
index 51adc04..a35f410 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -120,12 +120,17 @@
 'type' => 'random',
 'backends' => ['ruthenium.eqiad.wmnet'],
 },
+'rutherfordium' => { # people.wikimedia.org
+'dynamic' => 'no',
+'type' => 'random',
+'backends' => ['rutherfordium.eqiad.wmnet'],
+},
 'stat1001' => { # metrics and metrics-api
 'dynamic' => 'no',
 'type' => 'random',
 'backends' => ['stat1001.eqiad.wmnet'],
 },
-'terbium' => { # public_html
+'terbium' => { # noc.wikimedia.org
 'dynamic' => 'no',
 'type' => 'random',
 'backends' => ['terbium.eqiad.wmnet'],
diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index a363423..09f51ba 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -63,7 +63,7 @@
 // No caching of OTRS for now
 return (pass);
 } elsif (req.http.Host == "people.wikimedia.org") {
-set req.backend = terbium;
+set req.backend = rutherfordium;
 // No caching of public_html dirs
 return (pass);
 } elsif (req.http.Host == "racktables.wikimedia.org" || req.http.Host == 
"rt.wikimedia.org") {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bc23224612ce18f6609f84c22c3a5eeaf263a5c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits