From 93837d20f13179ede1a84a7783b5534627efce33 Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@loria.fr>
Date: Mon, 1 Jul 2019 10:42:40 +0200
Subject: [PATCH] skip clusters where kavlan is globally set to false (used for
initial cluster installation)
---
lib/refrepo/input_loader.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index 6fc621eb377..46a5535c578 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -77,6 +77,7 @@ def add_kavlan_ips(h)
# forget about allocated ips for local vlans, since we are starting a new site
allocated.delete_if { |k, v| v[3] == 'local' }
hs['clusters'].each_pair do |cluster_uid, hc|
+ next if hc['kavlan'] and hc['kavlan'] == false # skip clusters where kavlan is globally set to false (used for initial cluster installation)
hc['nodes'].each_pair do |node_uid, hn|
raise "Node hash for #{node_uid} is nil" if hn.nil?
raise "Old kavlan data in input/ for #{node_uid}" if hn.has_key?('kavlan')
--
GitLab