imagery: fix dual encoding issue

[chef.git] / cookbooks / networking / templates / default / network.erb

diff --git a/cookbooks/networking/templates/default/network.erb b/cookbooks/networking/templates/default/network.erb
index 796bf67d6f4c51c69e3386fe4efe41a77fc99085..7f38de3c563d14bd1f37d13c08129766d94c6d1e 100644 (file)
--- a/cookbooks/networking/templates/default/network.erb
+++ b/cookbooks/networking/templates/default/network.erb
@@ -15,6 +15,12 @@ IPv6AcceptRA=no
 <% Array(@interface[:vlans]).sort.uniq.each do |vlan| -%>
 VLAN=<%= @interface[:interface] %>.<%= vlan %>
 <% end -%>
+<% if @interface[:interface] =~ /^bond\d+$/ && node[:packages][:systemd][:version].to_i < 254 -%>
+
+[Link]
+RequiredFamilyForOnline=ipv4
+RequiredForOnline=degraded-carrier
+<% end -%>
 <% if @interface.dig(:inet6, :dhcp) -%>
 
 [DHCPv6]
@@ -47,6 +53,7 @@ Table=<%= @interface[:source_route_table] %>
 [RoutingPolicyRule]
 From=<%= @interface[:inet][:address] %>
 Table=<%= @interface[:source_route_table] %>
+Priority=1000
 <% end -%>
 <% end -%>
 <% if @interface.dig(:inet6, :gateway) && @interface[:inet6][:gateway] != @interface[:inet6][:address] -%>
@@ -70,6 +77,7 @@ Table=<%= @interface[:source_route_table] %>
 [RoutingPolicyRule]
 From=<%= @interface[:inet6][:address] %>
 Table=<%= @interface[:source_route_table] %>
+Priority=1000
 <% end -%>
 <% end -%>
 <% Hash(@interface.dig(:inet, :routes)).sort.each do |destination, details| -%>
@@ -104,3 +112,35 @@ Type=<%= details[:type] %>
 <% end -%>
 <% end -%>
 <% end -%>
+<% Array(@interface.dig(:inet, :rules)).each do |rule| -%>
+
+[RoutingPolicyRule]
+<% if rule[:from] -%>
+From=<%= rule[:from] %>
+<% end -%>
+<% if rule[:to] -%>
+To=<%= rule[:to] %>
+<% end -%>
+<% if rule[:table] -%>
+Table=<%= rule[:table] %>
+<% end -%>
+<% if rule[:priority] -%>
+Priority=<%= rule[:priority] %>
+<% end -%>
+<% end -%>
+<% Array(@interface.dig(:inet6, :rules)).each do |rule| -%>
+
+[RoutingPolicyRule]
+<% if rule[:from] -%>
+From=<%= rule[:from] %>
+<% end -%>
+<% if rule[:to] -%>
+To=<%= rule[:to] %>
+<% end -%>
+<% if rule[:table] -%>
+Table=<%= rule[:table] %>
+<% end -%>
+<% if rule[:priority] -%>
+Priority=<%= rule[:priority] %>
+<% end -%>
+<% end -%>