From: Sofer Athlan-Guyot <sathlang@redhat.com>
Date: Thu, 17 Mar 2016 16:44:41 +0000 (+0100)
Subject: Hack to fix IPv6 parsing in facter.
X-Git-Tag: opnfv-6.0.0~798
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=85e3c3e979be3dbfe98ce8a72b5a8cbf411102ed;p=apex-puppet-tripleo.git

Hack to fix IPv6 parsing in facter.

This kludge fixes the wrong regexp used in facter to report all IPv6
addresses.

While the upstream bug[1] is being work out, this should do the job.

Closes-Bug: 1558490

[1] https://tickets.puppetlabs.com/browse/FACT-1372

Change-Id: I85dabbd26bf8f25b2a03d22f547618b666421a83
---

diff --git a/lib/facter/netmask_ipv6.rb b/lib/facter/netmask_ipv6.rb
index 5261485..598641f 100644
--- a/lib/facter/netmask_ipv6.rb
+++ b/lib/facter/netmask_ipv6.rb
@@ -8,6 +8,8 @@ def netmask6(value)
 end
 
 if Facter.value('facterversion')[0].to_i < 3
+  Facter::Util::IP::REGEX_MAP[:linux][:ipaddress6] =
+    /inet6 (?:addr: )?((?!(?:fe80|::1))(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/
   Facter::Util::IP.get_interfaces.each do |interface|
     Facter.add('netmask6_' + Facter::Util::IP.alphafy(interface)) do
       setcode do