BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/161118
Change subject: use regsubst instead of inline_template
......................................................................
use regsubst instead of inline_template
(Works in "puppet apply" testing, just like the
last variant that failed in the real world...)
Change-Id: Id11f3df4d0f64545f1df1e9642f4d7a41345483f
---
M modules/interface/manifests/tagged.pp
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/161118/1
diff --git a/modules/interface/manifests/tagged.pp
b/modules/interface/manifests/tagged.pp
index eb87ac8..7475998 100644
--- a/modules/interface/manifests/tagged.pp
+++ b/modules/interface/manifests/tagged.pp
@@ -33,8 +33,9 @@
}
if $v6_token {
- $v6_token_addr = inline_template("::<%= @address.gsub('.', ':') %>")
- $v6_token_cmd = "set iface[. = '${intf}']/up /sbin/ip token set
'${v6_token_addr}' dev '${intf}'"
+ $v6_token_lower64 = regsubst($address, '\.', ':', 'G')
+ $v6_token_addr = "::${v6_token_lower64}"
+ $v6_token_cmd = "set iface[. = '${intf}']/up /sbin/ip token set
${v6_token_addr} dev ${intf}"
} else {
$v6_token_cmd = ''
}
--
To view, visit https://gerrit.wikimedia.org/r/161118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id11f3df4d0f64545f1df1e9642f4d7a41345483f
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
