openstack/fuel-library
Code Issues Proposed changes

FIX: bonding opts

Browse Source
This commit is contained in:
Sergey Vasilenko 2013-03-21 22:41:39 +04:00
parent dd0dd4b33c
commit b17a1fca58
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/puppet/l23network/templates/ipconfig_Debian_dhcp.erb
View File

@ -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 %>

8
deployment/puppet/l23network/templates/ipconfig_Debian_manual.erb
View File

@ -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 %>

6
deployment/puppet/l23network/templates/ipconfig_Debian_static.erb
View File

@ -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 %>

2
deployment/puppet/l23network/templates/ipconfig_RedHat_dhcp.erb
View File

@ -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 %>

2
deployment/puppet/l23network/templates/ipconfig_RedHat_manual.erb
View File

@ -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 %>

2
deployment/puppet/l23network/templates/ipconfig_RedHat_static.erb
View File

@ -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 %>