diff --git a/modules/profile/manifests/cache/varnish/backend.pp b/modules/profile/manifests/cache/varnish/backend.pp index 23b2268306..dcb07f6f8c 100644 --- a/modules/profile/manifests/cache/varnish/backend.pp +++ b/modules/profile/manifests/cache/varnish/backend.pp @@ -18,6 +18,7 @@ # List of prometheus nodes # class profile::cache::varnish::backend( + $app_directors = hiera('cache::app_directors'), $storage_parts = hiera('profile::cache::varnish::backend::storage_parts'), $statsd_host = hiera('statsd'), $prometheus_nodes = hiera('prometheus_nodes'), @@ -44,6 +45,22 @@ class profile::cache::varnish::backend( Varnish::Setup_filesystem <| |> -> Varnish::Instance <| |> $file_storage_args = join($filesystems.map |$idx, $store| { "-s main${$idx + 1}=file,/srv/${store}/varnish.main${$idx + 1},${storage_size}G" }, ' ') + varnish::instance { "${cache_cluster}-backend": + instance_name => '', + layer => 'backend', + vcl => "${cache_cluster}-backend", + extra_vcl => $be_extra_vcl, + ports => [ '3128' ], + admin_port => 6083, + storage => $file_storage_args, + vcl_config => $vcl_config, + app_directors => $app_directors, + app_def_be_opts => $app_def_be_opts, + backend_caches => $our_backend_caches, + wikimedia_nets => $wikimedia_nets, + wikimedia_trust => $wikimedia_trust, + } + if $::realm == 'production' { # Periodic varnish backend cron restarts, we need this to mitigate # T145661 diff --git a/modules/role/manifests/cache/upload_ats.pp b/modules/role/manifests/cache/upload_ats.pp index 2fadae278c..0914248c35 100644 --- a/modules/role/manifests/cache/upload_ats.pp +++ b/modules/role/manifests/cache/upload_ats.pp @@ -10,5 +10,6 @@ class role::cache::upload_ats { include ::profile::cache::ssl::unified include ::profile::cache::varnish::frontend - include ::profile::trafficserver::backend + include ::profile::cache::varnish::backend + #include ::profile::trafficserver::backend }