BBlack has submitted this change and it was merged.
Change subject: get rid of $active_nodes[api] (unused)
......................................................................
get rid of $active_nodes[api] (unused)
Change-Id: Iacf5d571b19f92953e369634c60b0171c50a7a11
---
M modules/role/manifests/cache/configuration.pp
M modules/torrus/templates/varnish.xml.erb
M modules/torrus/tests/cdn.pp
3 files changed, 0 insertions(+), 36 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/cache/configuration.pp
b/modules/role/manifests/cache/configuration.pp
index 5c5f4bf..b686b4d 100644
--- a/modules/role/manifests/cache/configuration.pp
+++ b/modules/role/manifests/cache/configuration.pp
@@ -43,11 +43,6 @@
'cp4018.ulsfo.wmnet',
]
},
- 'api' => {
- 'eqiad' => [],
- 'esams' => [],
- 'ulsfo' => [],
- },
'bits' => {
'eqiad' => [
'cp1056.eqiad.wmnet',
@@ -148,9 +143,6 @@
},
},
'labs' => {
- 'api' => {
- 'eqiad' => '127.0.0.1',
- },
'bits' => {
'eqiad' => '127.0.0.1',
},
diff --git a/modules/torrus/templates/varnish.xml.erb
b/modules/torrus/templates/varnish.xml.erb
index c9edcb6..1af402b 100644
--- a/modules/torrus/templates/varnish.xml.erb
+++ b/modules/torrus/templates/varnish.xml.erb
@@ -86,16 +86,6 @@
<% end -%>
</subtree>
- <subtree name="api">
- <param name="system-id"
value="%hostname%"/>
- <param name="varnishcluster" value="API
caches eqiad"/>
- <param name="site" value="eqiad"/>
-
-<% varnish_nodes('api', 'eqiad').each do |line| -%>
- <%= line %>
-<% end -%>
- </subtree>
-
<subtree name="bits">
<param name="system-id"
value="%hostname%"/>
<param name="varnishcluster"
value="Bits caches eqiad"/>
@@ -154,16 +144,6 @@
<param name="site" value="esams"/>
<% varnish_nodes('text', 'esams', 'dual-layer-varnish-server').each do |line|
-%>
- <%= line %>
-<% end -%>
- </subtree>
-
- <subtree name="api">
- <param name="system-id"
value="%hostname%"/>
- <param name="varnishcluster" value="API
caches esams"/>
- <param name="site" value="esams"/>
-
-<% varnish_nodes('api', 'esams').each do |line| -%>
<%= line %>
<% end -%>
</subtree>
diff --git a/modules/torrus/tests/cdn.pp b/modules/torrus/tests/cdn.pp
index 869dcd3..5d3bbfb 100644
--- a/modules/torrus/tests/cdn.pp
+++ b/modules/torrus/tests/cdn.pp
@@ -18,11 +18,6 @@
'cp4018.ulsfo.wmnet',
]
},
- 'api' => {
- 'eqiad' => [],
- 'esams' => [],
- 'ulsfo' => [],
- },
'bits' => {
'eqiad' => ['cp1056.eqiad.wmnet',
'cp1070.eqiad.wmnet',
@@ -71,9 +66,6 @@
}
},
'labs' => {
- 'api' => {
- 'eqiad' => '127.0.0.1',
- },
'bits' => {
'eqiad' => '127.0.0.1',
},
--
To view, visit https://gerrit.wikimedia.org/r/204052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacf5d571b19f92953e369634c60b0171c50a7a11
Gerrit-PatchSet: 5
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
