Mark Bergsma has submitted this change and it was merged.
Change subject: Replace '/' separator with a space
......................................................................
Replace '/' separator with a space
Puppet seems to convert / for a resource identifier into a -
Change-Id: If81bd6cb64c5a348bde84bdd2922cf0ce4ac8dbe
---
M manifests/varnish.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Verified; Looks good to me, approved
diff --git a/manifests/varnish.pp b/manifests/varnish.pp
index 6c3fd69..f78bb4d 100644
--- a/manifests/varnish.pp
+++ b/manifests/varnish.pp
@@ -54,7 +54,7 @@
}
define extra-vcl {
- $vcl = regsubst($title, '^([^/]+)/', '\1')
+ $vcl = regsubst($title, '^[^ ]+ ', '\1')
$filename = "/etc/varnish/${vcl}.inc.vcl"
if !defined(File[$filename]) {
file { $filename:
@@ -107,7 +107,7 @@
# Install VCL include files shared by all instances
require "varnish::common-vcl"
- $extra_vcl_variable_to_make_puppet_parser_happy =
suffix($extra_vcl, "/${instancesuffix}")
+ $extra_vcl_variable_to_make_puppet_parser_happy =
suffix($extra_vcl, " ${instancesuffix}")
extra-vcl{ $extra_vcl_variable_to_make_puppet_parser_happy: }
file {
--
To view, visit https://gerrit.wikimedia.org/r/66236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If81bd6cb64c5a348bde84bdd2922cf0ce4ac8dbe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
