BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224649
Change subject: varnish: default dynamic_directors true (changes eqiad)
......................................................................
varnish: default dynamic_directors true (changes eqiad)
Bug: T97029
Change-Id: I3bfd4bc89f97d3a8604121eeae5b403a9a96a3ef
---
D hieradata/codfw/varnish.yaml
D hieradata/common/varnish.yaml
D hieradata/esams/varnish.yaml
D hieradata/ulsfo/varnish.yaml
M modules/varnish/manifests/instance.pp
5 files changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/224649/1
diff --git a/hieradata/codfw/varnish.yaml b/hieradata/codfw/varnish.yaml
deleted file mode 100644
index a089bba..0000000
--- a/hieradata/codfw/varnish.yaml
+++ /dev/null
@@ -1 +0,0 @@
-dynamic_directors: true
diff --git a/hieradata/common/varnish.yaml b/hieradata/common/varnish.yaml
deleted file mode 100644
index 4d485e6..0000000
--- a/hieradata/common/varnish.yaml
+++ /dev/null
@@ -1 +0,0 @@
-dynamic_directors: false
diff --git a/hieradata/esams/varnish.yaml b/hieradata/esams/varnish.yaml
deleted file mode 100644
index a089bba..0000000
--- a/hieradata/esams/varnish.yaml
+++ /dev/null
@@ -1 +0,0 @@
-dynamic_directors: true
diff --git a/hieradata/ulsfo/varnish.yaml b/hieradata/ulsfo/varnish.yaml
deleted file mode 100644
index a089bba..0000000
--- a/hieradata/ulsfo/varnish.yaml
+++ /dev/null
@@ -1 +0,0 @@
-dynamic_directors: true
diff --git a/modules/varnish/manifests/instance.pp
b/modules/varnish/manifests/instance.pp
index c7e71bd..0a0879c 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -42,7 +42,7 @@
$varnish_directors = $directors
$varnish_backend_options = $backend_options
# $cluster_option is referenced directly
- $dynamic_directors = hiera('varnish::dynamic_directors', false)
+ $dynamic_directors = hiera('varnish::dynamic_directors', true)
# Install VCL include files shared by all instances
require varnish::common::vcl
--
To view, visit https://gerrit.wikimedia.org/r/224649
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bfd4bc89f97d3a8604121eeae5b403a9a96a3ef
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
