BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/272726
Change subject: cache_misc: remove cp1057, cp1070
......................................................................
cache_misc: remove cp1057, cp1070
Bug: T125486
Change-Id: I2a2e2f8e90f71a35359799397e9b50a9e792ca3b
---
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, 1 insertion(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/272726/1
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index 4893f90..d75c063 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -262,8 +262,6 @@
cp1051.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp1058.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp1061.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
- cp1057.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]
wtp1002.eqiad.wmnet: [parsoid]
diff --git a/hieradata/common/cache/ipsec/misc.yaml
b/hieradata/common/cache/ipsec/misc.yaml
index 02799b1..a92f694 100644
--- a/hieradata/common/cache/ipsec/misc.yaml
+++ b/hieradata/common/cache/ipsec/misc.yaml
@@ -4,8 +4,6 @@
- 'cp1051.eqiad.wmnet'
- 'cp1058.eqiad.wmnet'
- 'cp1061.eqiad.wmnet'
- - 'cp1057.eqiad.wmnet'
- - 'cp1070.eqiad.wmnet'
codfw:
- 'cp2006.codfw.wmnet'
- 'cp2012.codfw.wmnet'
diff --git a/hieradata/common/cache/misc.yaml b/hieradata/common/cache/misc.yaml
index 02799b1..a92f694 100644
--- a/hieradata/common/cache/misc.yaml
+++ b/hieradata/common/cache/misc.yaml
@@ -4,8 +4,6 @@
- 'cp1051.eqiad.wmnet'
- 'cp1058.eqiad.wmnet'
- 'cp1061.eqiad.wmnet'
- - 'cp1057.eqiad.wmnet'
- - 'cp1070.eqiad.wmnet'
codfw:
- 'cp2006.codfw.wmnet'
- 'cp2012.codfw.wmnet'
diff --git a/manifests/site.pp b/manifests/site.pp
index 387282f..cce0786 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -351,14 +351,9 @@
role cache::text, ipsec
}
-node 'cp1056.eqiad.wmnet', 'cp1069.eqiad.wmnet' {
+node 'cp1056.eqiad.wmnet', 'cp1057.eqiad.wmnet, 'cp1069.eqiad.wmnet',
'cp1070.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
}
node /^cp20(0[147]|1[0369]|23)\.codfw\.wmnet$/ {
--
To view, visit https://gerrit.wikimedia.org/r/272726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a2e2f8e90f71a35359799397e9b50a9e792ca3b
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
