BBlack has submitted this change and it was merged.
Change subject: add_ip6_mapped: no-op refactor to make +token commit simpler
......................................................................
add_ip6_mapped: no-op refactor to make +token commit simpler
Change-Id: I82b1fd15c7bc5d33b580d5897f9efdf9b65adccf
---
M modules/interface/manifests/add_ip6_mapped.pp
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/interface/manifests/add_ip6_mapped.pp
b/modules/interface/manifests/add_ip6_mapped.pp
index 9a35c76..f0dbd2f 100644
--- a/modules/interface/manifests/add_ip6_mapped.pp
+++ b/modules/interface/manifests/add_ip6_mapped.pp
@@ -18,8 +18,10 @@
$ip4_address = "::${ipv4_address}"
}
- $ipv6_address = inline_template("<%= require 'ipaddr';
(IPAddr.new(scope.lookupvar(\"::ipaddress6_${intf}\")).mask(64) |
IPAddr.new(ip4_address.gsub('.', ':'))).to_s() %>")
+ # $v6_mapped_lower64 looks like '::10:0:2:1' for a v4 of '10.0.2.1'
+ $v6_mapped_lower64 = regsubst($ip4_address, '\.', ':', 'G')
+ $ipv6_address = inline_template("<%= require 'ipaddr';
(IPAddr.new(scope.lookupvar(\"::ipaddress6_${intf}\")).mask(64) |
IPAddr.new(v6_mapped_lower64)).to_s() %>")
interface::ip { $title:
interface => $intf,
address => $ipv6_address,
--
To view, visit https://gerrit.wikimedia.org/r/200591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82b1fd15c7bc5d33b580d5897f9efdf9b65adccf
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
