Mark Bergsma has submitted this change and it was merged. Change subject: Setup a misc services varnish cluster ......................................................................
Setup a misc services varnish cluster Change-Id: Ida97c5beb3fe3d85554e56b25f2c0b0e33915c03 --- M manifests/role/cache.pp A templates/varnish/misc.inc.vcl.erb 2 files changed, 38 insertions(+), 1 deletion(-) Approvals: Mark Bergsma: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 333c7cb..a5a0682 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -189,6 +189,9 @@ "pmtpa" => [], "eqiad" => ['cp1045.eqiad.wmnet', 'cp1058.eqiad.wmnet'], "esams" => [] + }, + 'misc' => { + 'eqiad' => ['cp1043.wikimedia.org', 'cp1044.wikimedia.org'], } }, 'labs' => { @@ -306,7 +309,7 @@ }, "mobile" => { "pmtpa" => [], - "eqiad" => ['cp1041.eqiad.wmnet', 'cp1042.eqiad.wmnet', 'cp1043.wikimedia.org', 'cp1044.wikimedia.org'], + "eqiad" => ['cp1041.eqiad.wmnet', 'cp1042.eqiad.wmnet'], "esams" => [] }, "parsoid" => { @@ -1107,4 +1110,38 @@ }, } } + + class misc inherits role::cache::varnish::1layer { + $cluster = "cache_misc" + $nagios_group = "cache_misc_${::site}" + + class { "lvs::realserver": realserver_ips => $lvs::configuration::lvs_service_ips[$::realm]['misc'][$::site] } + + system_role { 'role::cache::misc': description => 'misc Varnish cache server' } + + include standard, + nrpe + + varnish::instance { 'misc': + name => '', + vcl => 'misc', + port => 80, + admin_port => 6082, + storage => "-s malloc,${memory_storage_size}G", + vcl_config => { + 'retry503' => 4, + 'retry5xx' => 1, + 'cache4xx' => '1m', + 'layer' => 'frontend', + 'ssl_proxies' => $wikimedia_networks, + }, + backend_options => { + 'port' => 80, + 'connect_timeout' => '5s', + 'first_byte_timeout' => '35s', + 'between_bytes_timeout' => '4s', + 'max_connections' => 100, + } + } + } } diff --git a/templates/varnish/misc.inc.vcl.erb b/templates/varnish/misc.inc.vcl.erb new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/templates/varnish/misc.inc.vcl.erb -- To view, visit https://gerrit.wikimedia.org/r/78090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida97c5beb3fe3d85554e56b25f2c0b0e33915c03 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits