BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200591
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, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/200591/1
diff --git a/modules/interface/manifests/add_ip6_mapped.pp
b/modules/interface/manifests/add_ip6_mapped.pp
index 9a35c76..19caaad 100644
--- a/modules/interface/manifests/add_ip6_mapped.pp
+++ b/modules/interface/manifests/add_ip6_mapped.pp
@@ -12,13 +12,16 @@
}
else {
if ! $ipv4_address {
- $ip4_address = "::${::ipaddress}"
+ $ip4_address = "${::ipaddress}"
}
else {
- $ip4_address = "::${ipv4_address}"
+ $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 = regsubst($ip4_address, '\.', ':', 'G')
+ $v6_mapped_addr = "::${v6_mapped_addr}"
+
+ $ipv6_address = inline_template("<%= require 'ipaddr';
(IPAddr.new(scope.lookupvar(\"::ipaddress6_${intf}\")).mask(64) |
IPAddr.new(v6_mapped_addr).to_s() %>")
interface::ip { $title:
interface => $intf,
--
To view, visit https://gerrit.wikimedia.org/r/200591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82b1fd15c7bc5d33b580d5897f9efdf9b65adccf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
