BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372554 )
Change subject: Configure cp4021-28 into upload+text clusters
......................................................................
Configure cp4021-28 into upload+text clusters
(They'll be depooled by default and thus not servicing traffic,
but "live" for all practical purposes like ipsec)
Bug: T171967
Bug: T171966
Bug: T172198
Change-Id: Ibe223be575a273e4785b9b8191cfac3ac4fc4bf1
---
M conftool-data/node/ulsfo.yaml
M hieradata/common/cache/text.yaml
M hieradata/common/cache/upload.yaml
M manifests/site.pp
4 files changed, 19 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/372554/1
diff --git a/conftool-data/node/ulsfo.yaml b/conftool-data/node/ulsfo.yaml
index 998cc60..2e0ed44 100644
--- a/conftool-data/node/ulsfo.yaml
+++ b/conftool-data/node/ulsfo.yaml
@@ -6,6 +6,8 @@
cp4016.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
cp4017.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
cp4018.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
+ cp4027.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
+ cp4028.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
cache_upload:
cp4005.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
cp4006.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
@@ -13,3 +15,9 @@
cp4013.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
cp4014.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
cp4015.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
+ cp4021.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
+ cp4022.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
+ cp4023.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
+ cp4024.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
+ cp4025.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
+ cp4026.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
diff --git a/hieradata/common/cache/text.yaml b/hieradata/common/cache/text.yaml
index 0f727b3..2ceb395 100644
--- a/hieradata/common/cache/text.yaml
+++ b/hieradata/common/cache/text.yaml
@@ -33,3 +33,5 @@
- 'cp4016.ulsfo.wmnet'
- 'cp4017.ulsfo.wmnet'
- 'cp4018.ulsfo.wmnet'
+ - 'cp4027.ulsfo.wmnet'
+ - 'cp4028.ulsfo.wmnet'
diff --git a/hieradata/common/cache/upload.yaml
b/hieradata/common/cache/upload.yaml
index 53fe5fa..ecead18 100644
--- a/hieradata/common/cache/upload.yaml
+++ b/hieradata/common/cache/upload.yaml
@@ -43,3 +43,8 @@
- 'cp4014.ulsfo.wmnet'
- 'cp4015.ulsfo.wmnet'
- 'cp4021.ulsfo.wmnet'
+ - 'cp4022.ulsfo.wmnet'
+ - 'cp4023.ulsfo.wmnet'
+ - 'cp4024.ulsfo.wmnet'
+ - 'cp4025.ulsfo.wmnet'
+ - 'cp4026.ulsfo.wmnet'
diff --git a/manifests/site.pp b/manifests/site.pp
index d39abfb..4cd7458 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -345,15 +345,14 @@
class { 'tlsproxy::prometheus': }
}
-# temporary entry for testing new cache node hardware setup...
-node 'cp4021.ulsfo.wmnet' {
+node /^cp402[1-6]\.ulsfo\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
role(cache::upload, ipsec)
}
-# temporary entry for new cache nodes
-node /^cp402[2-8]\.ulsfo\.wmnet$/ {
- role(spare::system)
+node /^cp402[78]\.ulsfo\.wmnet$/ {
+ interface::add_ip6_mapped { 'main': }
+ role(cache::text, ipsec)
}
node 'darmstadtium.eqiad.wmnet' {
--
To view, visit https://gerrit.wikimedia.org/r/372554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe223be575a273e4785b9b8191cfac3ac4fc4bf1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
