BBlack has submitted this change and it was merged.
Change subject: cp10[56]1: upload->misc
......................................................................
cp10[56]1: upload->misc
Bug: T125486
Change-Id: I93d871288a519b3939746b2af217c5379705c617
---
M conftool-data/nodes/eqiad.yaml
M hieradata/common/cache/ipsec/misc.yaml
M hieradata/common/cache/ipsec/upload.yaml
M hieradata/common/cache/misc.yaml
M hieradata/common/cache/upload.yaml
M manifests/site.pp
M modules/ganglia/manifests/deprecated/collector.pp
7 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index 8075531..4893f90 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -233,8 +233,6 @@
cp1048.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp1049.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp1050.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
- cp1051.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
- cp1061.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp1062.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp1063.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp1064.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
@@ -261,7 +259,9 @@
hydrogen.wikimedia.org: [pdns_recursor]
cache_misc:
cp1045.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ 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:
diff --git a/hieradata/common/cache/ipsec/misc.yaml
b/hieradata/common/cache/ipsec/misc.yaml
index ecf8761..02799b1 100644
--- a/hieradata/common/cache/ipsec/misc.yaml
+++ b/hieradata/common/cache/ipsec/misc.yaml
@@ -1,7 +1,9 @@
nodes:
eqiad:
- 'cp1045.eqiad.wmnet'
+ - 'cp1051.eqiad.wmnet'
- 'cp1058.eqiad.wmnet'
+ - 'cp1061.eqiad.wmnet'
- 'cp1057.eqiad.wmnet'
- 'cp1070.eqiad.wmnet'
codfw:
diff --git a/hieradata/common/cache/ipsec/upload.yaml
b/hieradata/common/cache/ipsec/upload.yaml
index 7ebf1f7..a1d75c2 100644
--- a/hieradata/common/cache/ipsec/upload.yaml
+++ b/hieradata/common/cache/ipsec/upload.yaml
@@ -14,8 +14,6 @@
- 'cp1048.eqiad.wmnet'
- 'cp1049.eqiad.wmnet'
- 'cp1050.eqiad.wmnet'
- - 'cp1051.eqiad.wmnet'
- - 'cp1061.eqiad.wmnet'
- 'cp1062.eqiad.wmnet'
- 'cp1063.eqiad.wmnet'
- 'cp1064.eqiad.wmnet'
diff --git a/hieradata/common/cache/misc.yaml b/hieradata/common/cache/misc.yaml
index ecf8761..02799b1 100644
--- a/hieradata/common/cache/misc.yaml
+++ b/hieradata/common/cache/misc.yaml
@@ -1,7 +1,9 @@
nodes:
eqiad:
- 'cp1045.eqiad.wmnet'
+ - 'cp1051.eqiad.wmnet'
- 'cp1058.eqiad.wmnet'
+ - 'cp1061.eqiad.wmnet'
- 'cp1057.eqiad.wmnet'
- 'cp1070.eqiad.wmnet'
codfw:
diff --git a/hieradata/common/cache/upload.yaml
b/hieradata/common/cache/upload.yaml
index 7ebf1f7..a1d75c2 100644
--- a/hieradata/common/cache/upload.yaml
+++ b/hieradata/common/cache/upload.yaml
@@ -14,8 +14,6 @@
- 'cp1048.eqiad.wmnet'
- 'cp1049.eqiad.wmnet'
- 'cp1050.eqiad.wmnet'
- - 'cp1051.eqiad.wmnet'
- - 'cp1061.eqiad.wmnet'
- 'cp1062.eqiad.wmnet'
- 'cp1063.eqiad.wmnet'
- 'cp1064.eqiad.wmnet'
diff --git a/manifests/site.pp b/manifests/site.pp
index 086af30..1752105 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -329,7 +329,7 @@
role cache::maps
}
-node 'cp1045.eqiad.wmnet', 'cp1058.eqiad.wmnet' {
+node /^cp10(45|5[18]|61)\.eqiad\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
role cache::misc, ipsec
}
@@ -339,7 +339,7 @@
include standard # ex-mobile
}
-node /^cp10(4[89]|5[01]|6[1-4]|7[1-4]|99)\.eqiad\.wmnet$/ {
+node /^cp10(4[89]|50|6[234]|7[1-4]|99)\.eqiad\.wmnet$/ {
interface::add_ip6_mapped { 'main': }
role cache::upload, ipsec
}
diff --git a/modules/ganglia/manifests/deprecated/collector.pp
b/modules/ganglia/manifests/deprecated/collector.pp
index 9632a54..dd49294 100644
--- a/modules/ganglia/manifests/deprecated/collector.pp
+++ b/modules/ganglia/manifests/deprecated/collector.pp
@@ -15,7 +15,7 @@
# unlike other servers, netmon1001 uses the default rrd_rootdir
/^netmon1001$/: {
$data_sources = {
- 'Upload caches eqiad' => 'cp1048.eqiad.wmnet
cp1061.eqiad.wmnet'
+ 'Upload caches eqiad' => 'cp1048.eqiad.wmnet
cp1062.eqiad.wmnet'
}
$rra_sizes = '"RRA:AVERAGE:0:1:4032" "RRA:AVERAGE:0.17:6:2016"
"RRA:MAX:0.17:6:2016" "RRA:AVERAGE:0.042:288:732" "RRA:MAX:0.042:288:732"'
}
--
To view, visit https://gerrit.wikimedia.org/r/272725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I93d871288a519b3939746b2af217c5379705c617
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
