BBlack has submitted this change and it was merged.
Change subject: cache_misc: remove cp1056, cp1069
......................................................................
cache_misc: remove cp1056, cp1069
Bug: T125486
Change-Id: Ife86260a4bacd3e7dc1e30a3ecb50a4b1410ef72
---
M conftool-data/nodes/eqiad.yaml
M hieradata/common/cache/ipsec/misc.yaml
M hieradata/common/cache/misc.yaml
M manifests/site.pp
4 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
Ema: Looks good to me, but someone else must approve
BBlack: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index 7036f08..8075531 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -262,9 +262,7 @@
cache_misc:
cp1045.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp1058.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
- cp1056.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp1057.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
- cp1069.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp1070.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
parsoid:
wtp1001.eqiad.wmnet: [parsoid]
diff --git a/hieradata/common/cache/ipsec/misc.yaml
b/hieradata/common/cache/ipsec/misc.yaml
index f7f7661..ecf8761 100644
--- a/hieradata/common/cache/ipsec/misc.yaml
+++ b/hieradata/common/cache/ipsec/misc.yaml
@@ -2,9 +2,7 @@
eqiad:
- 'cp1045.eqiad.wmnet'
- 'cp1058.eqiad.wmnet'
- - 'cp1056.eqiad.wmnet'
- 'cp1057.eqiad.wmnet'
- - 'cp1069.eqiad.wmnet'
- 'cp1070.eqiad.wmnet'
codfw:
- 'cp2006.codfw.wmnet'
diff --git a/hieradata/common/cache/misc.yaml b/hieradata/common/cache/misc.yaml
index f7f7661..ecf8761 100644
--- a/hieradata/common/cache/misc.yaml
+++ b/hieradata/common/cache/misc.yaml
@@ -2,9 +2,7 @@
eqiad:
- 'cp1045.eqiad.wmnet'
- 'cp1058.eqiad.wmnet'
- - 'cp1056.eqiad.wmnet'
- 'cp1057.eqiad.wmnet'
- - 'cp1069.eqiad.wmnet'
- 'cp1070.eqiad.wmnet'
codfw:
- 'cp2006.codfw.wmnet'
diff --git a/manifests/site.pp b/manifests/site.pp
index bcf4124..57fc515 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -351,7 +351,12 @@
role cache::text, ipsec
}
-node 'cp1056.eqiad.wmnet', 'cp1057.eqiad.wmnet', 'cp1069.eqiad.wmnet',
'cp1070.eqiad.wmnet' {
+node 'cp1056.eqiad.wmnet', 'cp1069.eqiad.wmnet' {
+ interface::add_ip6_mapped { 'main': }
+ include standard # ex-misc
+}
+
+node 'cp1057.eqiad.wmnet', 'cp1070.eqiad.wmnet' {
interface::add_ip6_mapped { 'main': }
role cache::misc, ipsec
}
--
To view, visit https://gerrit.wikimedia.org/r/272723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife86260a4bacd3e7dc1e30a3ecb50a4b1410ef72
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
