Don't create ethernet devices for bond interfaces with vlans

[chef.git] / cookbooks / networking / recipes / default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index e89064d6821d116b1f65d6b33bdd123627e4691f..04c1c6258d6ab9e63f1fba3184534152f8099646 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -69,7 +69,7 @@ node[:networking][:interfaces].each do |name, interface|
           "accept-ra" => false,
           "addresses" => [],
           "routes" => [],
-          "interfaces" => interface[:bond][:slaves],
+          "interfaces" => interface[:bond][:slaves].to_a,
           "mode" => interface[:bond][:mode] || "active-backup",
           "primary" => interface[:bond][:slaves].first,
           "mii-monitor-interval" => interface[:bond][:miimon] || 100,
@@ -123,7 +123,9 @@ if node[:networking][:netplan]
   end
 
   netplan["network"]["vlans"].each_value do |vlan|
-    netplan["network"]["ethernets"][vlan["link"]] ||= { "accept-ra" => false }
+    unless vlan["link"] =~ /^bond\d+$/
+      netplan["network"]["ethernets"][vlan["link"]] ||= { "accept-ra" => false }
+    end
   end
 
   file "/etc/netplan/99-chef.yaml" do