From eaad8a799f25495d7fb1160ac65156d438493476 Mon Sep 17 00:00:00 2001
From: Patrice RINGOT <patrice.ringot@loria.fr>
Date: Tue, 12 Jul 2022 19:40:59 +0200
Subject: [PATCH] [bind] fix kavlan/ip6/fpga issue
---
lib/refrepo/gen/puppet/bindg5k.rb | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/lib/refrepo/gen/puppet/bindg5k.rb b/lib/refrepo/gen/puppet/bindg5k.rb
index 21fc09096b0..0b770c1a6c4 100644
--- a/lib/refrepo/gen/puppet/bindg5k.rb
+++ b/lib/refrepo/gen/puppet/bindg5k.rb
@@ -314,10 +314,12 @@ def get_node_kavlan_records(_cluster_uid, node_uid, network_adapters, kavlan_ada
new_record_ipv6.label = "#{node_uid}-#{net_uid}" #sol-23-eth0-kavlan-1
new_record_ipv6.label += '-ipv6'
records << new_record_ipv6
- cname_record_ipv6 = DNS::Zone::RR::CNAME.new
- cname_record_ipv6.label = "#{node_uid}-#{net_hash['pname']}-ipv6"
- cname_record_ipv6.domainname = "#{node_uid}-#{net_uid}-ipv6" #sol-23-eno1-kavlan-1
- records << cname_record_ipv6
+ if !/^fpga[0-9]$/.match(net_uid_eth)
+ cname_record_ipv6 = DNS::Zone::RR::CNAME.new
+ cname_record_ipv6.label = "#{node_uid}-#{net_hash['pname']}-ipv6"
+ cname_record_ipv6.domainname = "#{node_uid}-#{net_uid}-ipv6" #sol-23-eno1-kavlan-1
+ records << cname_record_ipv6
+ end
end
# CNAME only for primary interface kavlan
@@ -663,7 +665,11 @@ def fetch_site_records(site, type)
kavlan_adapters["#{net_uid}-#{kavlan_net_uid}"]['mountable'] = node['network_adapters'].select { |n|
n['device'] == net_uid
}[0]['moutable']
- kavlan_adapters["#{net_uid}-#{kavlan_net_uid}"]['ip'] = ip
+ if kavlan_kind == 'kavlan6'
+ kavlan_adapters["#{net_uid}-#{kavlan_net_uid}"]['ip6'] = ip
+ else
+ kavlan_adapters["#{net_uid}-#{kavlan_net_uid}"]['ip'] = ip
+ end
end
}
}
--
GitLab