From 5a2b49f8348be30c2a59c844d3634c92d3389091 Mon Sep 17 00:00:00 2001
From: David Loup <david.loup@inria.fr>
Date: Mon, 23 Nov 2020 11:59:46 +0100
Subject: [PATCH] [lib/gen/reference-api] Fix the case where kavlan is disabled
on a cluster (for ruby 2.1.5)
---
lib/refrepo/gen/reference-api.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/refrepo/gen/reference-api.rb b/lib/refrepo/gen/reference-api.rb
index bffccad55ef..cb2a4b8e96b 100644
--- a/lib/refrepo/gen/reference-api.rb
+++ b/lib/refrepo/gen/reference-api.rb
@@ -307,7 +307,7 @@ def generate_reference_api
end
end
# If kavlan entry is not defined here, set it node's kavlan description
- network_adapter["kavlan"] ||= node["kavlan"].keys.include?(network_adapter["device"]) ? true : false rescue false
+ network_adapter["kavlan"] ||= node["kavlan"].nil? ? false : node["kavlan"].keys.include?(network_adapter["device"]) ? true : false
network_adapter.delete("network_address") if network_adapter["network_address"] == 'none'
}
--
GitLab