From b17a1fca580db0fd5c522691764bff586e601731 Mon Sep 17 00:00:00 2001 From: Sergey Vasilenko Date: Thu, 21 Mar 2013 22:41:39 +0400 Subject: [PATCH] FIX: bonding opts --- .../puppet/l23network/templates/ipconfig_Debian_dhcp.erb | 6 +++--- .../l23network/templates/ipconfig_Debian_manual.erb | 8 ++++---- .../l23network/templates/ipconfig_Debian_static.erb | 6 +++--- .../puppet/l23network/templates/ipconfig_RedHat_dhcp.erb | 2 +- .../l23network/templates/ipconfig_RedHat_manual.erb | 2 +- .../l23network/templates/ipconfig_RedHat_static.erb | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/deployment/puppet/l23network/templates/ipconfig_Debian_dhcp.erb b/deployment/puppet/l23network/templates/ipconfig_Debian_dhcp.erb index 0638c45062..eb53a83ae9 100644 --- a/deployment/puppet/l23network/templates/ipconfig_Debian_dhcp.erb +++ b/deployment/puppet/l23network/templates/ipconfig_Debian_dhcp.erb @@ -3,8 +3,8 @@ iface <%= interface %> inet dhcp <% if @dhcp_hostname %>hostname <%= @dhcp_hostname %><% end %> <% if @vlan_mode %>vlan_raw_device <%= @vlan_dev %><% end %> <% if @mtu %>mtu <%= @mtu %><% end %> -<% if @bond_mode %>bond-mode <%= @bond_mode %> -slaves none<% if @bond_mode == 4 %> -bond-miimon <%= @bond_miimon %> +<% if @bond_mode %>slaves none +bond-mode <%= @bond_mode %><% if @bond_miimon %> +bond-miimon <%= @bond_miimon %><% end %><% if @bond_lacp_rate %> bond-lacp-rate <%= @bond_lacp_rate %><% end %> <% end %> \ No newline at end of file diff --git a/deployment/puppet/l23network/templates/ipconfig_Debian_manual.erb b/deployment/puppet/l23network/templates/ipconfig_Debian_manual.erb index 136e2f8351..856f41d965 100644 --- a/deployment/puppet/l23network/templates/ipconfig_Debian_manual.erb +++ b/deployment/puppet/l23network/templates/ipconfig_Debian_manual.erb @@ -4,8 +4,8 @@ iface <%= interface %> inet manual up ip l set <%= interface %> up down ip l set <%= interface %> down <% if @mtu %>mtu <%= @mtu %><% end %> -<% if @bond_mode %>bond-mode <%= @bond_mode %> -slaves none<% if @bond_mode == 4 %> -bond-miimon <%= @bond_miimon %> +<% if @bond_mode %>slaves none +bond-mode <%= @bond_mode %><% if @bond_miimon %> +bond-miimon <%= @bond_miimon %><% end %><% if @bond_lacp_rate %> bond-lacp-rate <%= @bond_lacp_rate %><% end %> -<% end %> +<% end %> \ No newline at end of file diff --git a/deployment/puppet/l23network/templates/ipconfig_Debian_static.erb b/deployment/puppet/l23network/templates/ipconfig_Debian_static.erb index 9ce67a71a2..4fc4067fa5 100644 --- a/deployment/puppet/l23network/templates/ipconfig_Debian_static.erb +++ b/deployment/puppet/l23network/templates/ipconfig_Debian_static.erb @@ -8,8 +8,8 @@ netmask <%= netmask %> <% if @dns_search %>dns-search <%= @dns_search %><% end %> <% if @dns_domain %>dns-domain <%= @dns_domain %><% end %> <% if @mtu %>mtu <%= @mtu %><% end %> -<% if @bond_mode %>bond-mode <%= @bond_mode %> -slaves none<% if @bond_mode == 4 %> -bond-miimon <%= @bond_miimon %> +<% if @bond_mode %>slaves none +bond-mode <%= @bond_mode %><% if @bond_miimon %> +bond-miimon <%= @bond_miimon %><% end %><% if @bond_lacp_rate %> bond-lacp-rate <%= @bond_lacp_rate %><% end %> <% end %> \ No newline at end of file diff --git a/deployment/puppet/l23network/templates/ipconfig_RedHat_dhcp.erb b/deployment/puppet/l23network/templates/ipconfig_RedHat_dhcp.erb index 7b734ffc0e..832416b926 100644 --- a/deployment/puppet/l23network/templates/ipconfig_RedHat_dhcp.erb +++ b/deployment/puppet/l23network/templates/ipconfig_RedHat_dhcp.erb @@ -7,4 +7,4 @@ USERCTL=no <% if @vlan_mode == 'vlan' %>VLAN_NAME_TYPE=VLAN_PLUS_VID_NO_PAD PHYSDEV=<%= @vlan_dev %><% end %> <% if @mtu %>MTU=<%= @mtu %><% end %> -<% if @bond_mode %>BONDING_OPTS="mode=<%= @bond_mode %><% if @bond_mode == 4 %> miimon=<%= @bond_miimon %> bond-lacp-rate=<%= @bond_lacp_rate %><% end %>"<% end %> +<% if @bond_mode %>BONDING_OPTS="mode=<%= @bond_mode %><% if @bond_miimon %> miimon=<%= @bond_miimon %><% end %><% if @bond_lacp_rate %> bond-lacp-rate=<%= @bond_lacp_rate %><% end %>"<% end %> diff --git a/deployment/puppet/l23network/templates/ipconfig_RedHat_manual.erb b/deployment/puppet/l23network/templates/ipconfig_RedHat_manual.erb index 4ebc3d1555..40e061ab7e 100644 --- a/deployment/puppet/l23network/templates/ipconfig_RedHat_manual.erb +++ b/deployment/puppet/l23network/templates/ipconfig_RedHat_manual.erb @@ -6,4 +6,4 @@ USERCTL=no <% if @vlan_mode == 'vlan' %>VLAN_NAME_TYPE=VLAN_PLUS_VID_NO_PAD PHYSDEV=<%= @vlan_dev %><% end %> <% if @mtu %>MTU=<%= @mtu %><% end %> -<% if @bond_mode %>BONDING_OPTS="mode=<%= @bond_mode %><% if @bond_mode == 4 %> miimon=<%= @bond_miimon %> bond-lacp-rate=<%= @bond_lacp_rate %><% end %>"<% end %> +<% if @bond_mode %>BONDING_OPTS="mode=<%= @bond_mode %><% if @bond_miimon %> miimon=<%= @bond_miimon %><% end %><% if @bond_lacp_rate %> bond-lacp-rate=<%= @bond_lacp_rate %><% end %>"<% end %> diff --git a/deployment/puppet/l23network/templates/ipconfig_RedHat_static.erb b/deployment/puppet/l23network/templates/ipconfig_RedHat_static.erb index 65b9be31f0..19c2477211 100644 --- a/deployment/puppet/l23network/templates/ipconfig_RedHat_static.erb +++ b/deployment/puppet/l23network/templates/ipconfig_RedHat_static.erb @@ -11,4 +11,4 @@ PHYSDEV=<%= @vlan_dev %><% end %> <% if @dns_nameservers_1 %>DNS1=<%= @dns_nameservers_1 %><% end %> <% if @dns_nameservers_2 %>DNS2=<%= @dns_nameservers_2 %><% end %> <% if @mtu %>MTU=<%= @mtu %><% end %> -<% if @bond_mode %>BONDING_OPTS="mode=<%= @bond_mode %><% if @bond_mode == 4 %> miimon=<%= @bond_miimon %> bond-lacp-rate=<%= @bond_lacp_rate %><% end %>"<% end %> +<% if @bond_mode %>BONDING_OPTS="mode=<%= @bond_mode %><% if @bond_miimon %> miimon=<%= @bond_miimon %><% end %><% if @bond_lacp_rate %> bond-lacp-rate=<%= @bond_lacp_rate %><% end %>"<% end %>