Mark Bergsma has submitted this change and it was merged.
Change subject: Rename resources with dashes
......................................................................
Rename resources with dashes
Change-Id: Ib14e47778fe9d0bea845da14de8af0272c7c1cd1
---
M manifests/varnish.pp
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/varnish.pp b/manifests/varnish.pp
index 172535d..ff34fef 100644
--- a/manifests/varnish.pp
+++ b/manifests/varnish.pp
@@ -31,7 +31,7 @@
}
}
-class varnish::common-vcl {
+class varnish::common::vcl {
require "varnish::common"
file {
@@ -44,7 +44,7 @@
}
}
-define varnish::extra-vcl {
+define varnish::extra_vcl {
$vcl = regsubst($title, '^([^ ]+) .*$', '\1')
$filename = "/etc/varnish/${vcl}.inc.vcl"
if !defined(File[$filename]) {
@@ -96,10 +96,10 @@
# $cluster_option is referenced directly
# Install VCL include files shared by all instances
- require "varnish::common-vcl"
+ require "varnish::common::vcl"
$extra_vcl_variable_to_make_puppet_parser_happy = suffix($extra_vcl, "
${instancesuffix}")
- extra-vcl{ $extra_vcl_variable_to_make_puppet_parser_happy: }
+ extra_vcl{ $extra_vcl_variable_to_make_puppet_parser_happy: }
file {
"/etc/init.d/varnish${instancesuffix}":
@@ -137,7 +137,7 @@
exec { "load-new-vcl-file${instancesuffix}":
require => [ Service["varnish${instancesuffix}"],
File["/etc/varnish/wikimedia_${vcl}.vcl"] ],
subscribe => [File["/etc/varnish/wikimedia_${vcl}.vcl"],
- Class["varnish::common-vcl"],
+ Class["varnish::common::vcl"],
File[suffix(prefix($extra_vcl, "/etc/varnish/"), ".inc.vcl")]
],
command => "/usr/share/varnish/reload-vcl $extraopts",
--
To view, visit https://gerrit.wikimedia.org/r/68646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib14e47778fe9d0bea845da14de8af0272c7c1cd1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
