Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377797 )

Change subject: wdqs - decommissioning wdqs100[12]
......................................................................

wdqs - decommissioning wdqs100[12]

Bug: T175595
Change-Id: Ia072d7c47e2c55b83499f40dcafc9542fc49c08d
---
M conftool-data/node/eqiad.yaml
M manifests/site.pp
M modules/profile/templates/cumin/aliases.yaml.erb
3 files changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/377797/1

diff --git a/conftool-data/node/eqiad.yaml b/conftool-data/node/eqiad.yaml
index 85a3355..e42aee5 100644
--- a/conftool-data/node/eqiad.yaml
+++ b/conftool-data/node/eqiad.yaml
@@ -285,8 +285,6 @@
     prometheus1003.eqiad.wmnet: [prometheus]
     prometheus1004.eqiad.wmnet: [prometheus]
   wdqs:
-    wdqs1001.eqiad.wmnet: [wdqs]
-    wdqs1002.eqiad.wmnet: [wdqs]
     wdqs1003.eqiad.wmnet: [wdqs]
     wdqs1004.eqiad.wmnet: [wdqs]
     wdqs1005.eqiad.wmnet: [wdqs]
diff --git a/manifests/site.pp b/manifests/site.pp
index 092a09d..0253fbf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2287,7 +2287,11 @@
 }
 
 # Wikidata query service
-node /^wdqs100[1-5]\.eqiad\.wmnet$/ {
+node /^wdqs100[12]\.eqiad\.wmnet$/ {
+    role(spare::system)
+}
+
+node /^wdqs100[3-5]\.eqiad\.wmnet$/ {
     role(wdqs)
 }
 
diff --git a/modules/profile/templates/cumin/aliases.yaml.erb 
b/modules/profile/templates/cumin/aliases.yaml.erb
index 149cc33..14dd67d 100644
--- a/modules/profile/templates/cumin/aliases.yaml.erb
+++ b/modules/profile/templates/cumin/aliases.yaml.erb
@@ -175,7 +175,7 @@
 thumbor-eqiad: A:thumbor and A:eqiad
 url-downloader: P{R:class = role::url_downloader}
 wdqs: P{R:class = role::wdqs}
-wdqs-canary: P{wdqs1001.eqiad.wmnet}
+wdqs-canary: P{wdqs1003.eqiad.wmnet}
 yubiauth: P{R:class = role::yubiauth_server}
 
 # Miscellaneous groups

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia072d7c47e2c55b83499f40dcafc9542fc49c08d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to