[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove mediawiki02 from deployment prep

[Elukey (Code Review)]

Elukey has submitted this change and it was merged.

Change subject: Remove mediawiki02 from deployment prep
..


Remove mediawiki02 from deployment prep

A new Debian based instance, mediawiki05, will replace it.

Bug: T144006
Change-Id: If37d7801978e6477eceb1cfefd566a3fb6ad27e1
---
M hieradata/labs.yaml
M hieradata/labs/deployment-prep/common.yaml
M modules/restbase/templates/config.labs.yaml.erb
M modules/torrus/tests/cdn.pp
4 files changed, 5 insertions(+), 9 deletions(-)

Approvals:
  Elukey: Looks good to me, approved
  Hashar: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 0c20b4b..969abcd 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -51,19 +51,19 @@
 route: eqiad
 backends:
   eqiad:
-- '10.68.16.127' # deployment-mediawiki02
+- '10.68.19.241' # deployment-mediawiki06
 - '10.68.19.128' # deployment-mediawiki04
   api:
 route: eqiad
 backends:
   eqiad:
-- '10.68.16.127' # deployment-mediawiki02
+- '10.68.19.241' # deployment-mediawiki06
 - '10.68.19.128' # deployment-mediawiki04
   rendering:
 route: eqiad
 backends:
   eqiad:
-- '10.68.16.127' # deployment-mediawiki02
+- '10.68.19.241' # deployment-mediawiki06
 - '10.68.19.128' # deployment-mediawiki04
   security_audit:
 route: eqiad
diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 050634e..3360967 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -10,7 +10,7 @@
 has_lvs: false
 "puppetmaster::scripts::keep_reports_minutes": 360
 puppetmaster::autosigner: true
-service::configuration::mwapi_uri: 
http://deployment-mediawiki02.deployment-prep.eqiad.wmflabs/w/api.php
+service::configuration::mwapi_uri: 
http://deployment-mediawiki04.deployment-prep.eqiad.wmflabs/w/api.php
 service::configuration::restbase_uri: 
http://deployment-restbase02.deployment-prep.eqiad.wmflabs:7231
 #service::configuration::http_proxy:
 service::configuration::statsd_host: labmon1001.eqiad.wmnet
@@ -168,7 +168,6 @@
 mediawiki-installation:
 hosts:
 - deployment-jobrunner01.deployment-prep.eqiad.wmflabs
-- deployment-mediawiki02.deployment-prep.eqiad.wmflabs
 - deployment-mediawiki04.deployment-prep.eqiad.wmflabs
 - deployment-mediawiki06.deployment-prep.eqiad.wmflabs
 - deployment-tmh01.deployment-prep.eqiad.wmflabs
diff --git a/modules/restbase/templates/config.labs.yaml.erb 
b/modules/restbase/templates/config.labs.yaml.erb
index 45f188e..62d5ac1 100644
--- a/modules/restbase/templates/config.labs.yaml.erb
+++ b/modules/restbase/templates/config.labs.yaml.erb
@@ -31,7 +31,7 @@
 parsoid:
   host: <%= @parsoid_uri %>
 action:
-  apiUriTemplate: 
http://deployment-mediawiki02.deployment-prep.eqiad.wmflabs/w/api.php
+  apiUriTemplate: 
http://deployment-mediawiki04.deployment-prep.eqiad.wmflabs/w/api.php
 graphoid:
   host: <%= @graphoid_uri %>
 mathoid:
diff --git a/modules/torrus/tests/cdn.pp b/modules/torrus/tests/cdn.pp
index c6bbc8a..8e36a98 100644
--- a/modules/torrus/tests/cdn.pp
+++ b/modules/torrus/tests/cdn.pp
@@ -74,19 +74,16 @@
 'labs' => {
 'appservers' => {
 'eqiad' => [
-'10.68.17.208', # deployment-mediawiki02
 '10.68.19.128', # deployment-mediawiki04
 ],
 },
 'api' => {
 'eqiad' => [
-'10.68.17.208', # deployment-mediawiki02
 '10.68.19.128', # deployment-mediawiki04
 ],
 },
 'rendering' => {
 'eqiad' => [
-'10.68.17.208', # deployment-mediawiki02
 '10.68.19.128', # deployment-mediawiki04
 ],
 },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If37d7801978e6477eceb1cfefd566a3fb6ad27e1
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove mediawiki02 from deployment prep

[Elukey (Code Review)]

Elukey has uploaded a new change for review.

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

Change subject: Remove mediawiki02 from deployment prep
..

Remove mediawiki02 from deployment prep

A new Debian based instance, mediawiki05, will replace it.

Bug: T144006
Change-Id: If37d7801978e6477eceb1cfefd566a3fb6ad27e1
---
M hieradata/labs.yaml
M hieradata/labs/deployment-prep/common.yaml
M modules/restbase/templates/config.labs.yaml.erb
M modules/torrus/tests/cdn.pp
4 files changed, 5 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/310796/1

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 0c20b4b..6c93e58 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -51,19 +51,19 @@
 route: eqiad
 backends:
   eqiad:
-- '10.68.16.127' # deployment-mediawiki02
+- '10.68.16.127' # deployment-mediawiki06
 - '10.68.19.128' # deployment-mediawiki04
   api:
 route: eqiad
 backends:
   eqiad:
-- '10.68.16.127' # deployment-mediawiki02
+- '10.68.16.127' # deployment-mediawiki06
 - '10.68.19.128' # deployment-mediawiki04
   rendering:
 route: eqiad
 backends:
   eqiad:
-- '10.68.16.127' # deployment-mediawiki02
+- '10.68.16.127' # deployment-mediawiki06
 - '10.68.19.128' # deployment-mediawiki04
   security_audit:
 route: eqiad
diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 050634e..3360967 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -10,7 +10,7 @@
 has_lvs: false
 "puppetmaster::scripts::keep_reports_minutes": 360
 puppetmaster::autosigner: true
-service::configuration::mwapi_uri: 
http://deployment-mediawiki02.deployment-prep.eqiad.wmflabs/w/api.php
+service::configuration::mwapi_uri: 
http://deployment-mediawiki04.deployment-prep.eqiad.wmflabs/w/api.php
 service::configuration::restbase_uri: 
http://deployment-restbase02.deployment-prep.eqiad.wmflabs:7231
 #service::configuration::http_proxy:
 service::configuration::statsd_host: labmon1001.eqiad.wmnet
@@ -168,7 +168,6 @@
 mediawiki-installation:
 hosts:
 - deployment-jobrunner01.deployment-prep.eqiad.wmflabs
-- deployment-mediawiki02.deployment-prep.eqiad.wmflabs
 - deployment-mediawiki04.deployment-prep.eqiad.wmflabs
 - deployment-mediawiki06.deployment-prep.eqiad.wmflabs
 - deployment-tmh01.deployment-prep.eqiad.wmflabs
diff --git a/modules/restbase/templates/config.labs.yaml.erb 
b/modules/restbase/templates/config.labs.yaml.erb
index 45f188e..62d5ac1 100644
--- a/modules/restbase/templates/config.labs.yaml.erb
+++ b/modules/restbase/templates/config.labs.yaml.erb
@@ -31,7 +31,7 @@
 parsoid:
   host: <%= @parsoid_uri %>
 action:
-  apiUriTemplate: 
http://deployment-mediawiki02.deployment-prep.eqiad.wmflabs/w/api.php
+  apiUriTemplate: 
http://deployment-mediawiki04.deployment-prep.eqiad.wmflabs/w/api.php
 graphoid:
   host: <%= @graphoid_uri %>
 mathoid:
diff --git a/modules/torrus/tests/cdn.pp b/modules/torrus/tests/cdn.pp
index c6bbc8a..8e36a98 100644
--- a/modules/torrus/tests/cdn.pp
+++ b/modules/torrus/tests/cdn.pp
@@ -74,19 +74,16 @@
 'labs' => {
 'appservers' => {
 'eqiad' => [
-'10.68.17.208', # deployment-mediawiki02
 '10.68.19.128', # deployment-mediawiki04
 ],
 },
 'api' => {
 'eqiad' => [
-'10.68.17.208', # deployment-mediawiki02
 '10.68.19.128', # deployment-mediawiki04
 ],
 },
 'rendering' => {
 'eqiad' => [
-'10.68.17.208', # deployment-mediawiki02
 '10.68.19.128', # deployment-mediawiki04
 ],
 },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If37d7801978e6477eceb1cfefd566a3fb6ad27e1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 

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