x/puppet-n1k-vsm
Code Issues Proposed changes

Prevent vsm-br ip configuration for existing bridge cases

Browse Source 
Added a check to skip ip configuration in all existing bridge cases.
This was sporadically causing connectivity issue in some setups.

Change-Id: Ia759a84409d477b5be459033aeda37d353c93332
This commit is contained in:
Steven Hillman 2015-11-19 15:34:09 -08:00
parent 9eead39b6b
commit 3ee42190ff
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/pkgprep_ovscfg.pp
View File

@ -72,7 +72,7 @@ class n1k_vsm::pkgprep_ovscfg
#Gather info from the port/bridge including IP if needed #Gather info from the port/bridge including IP if needed
$_phy_if_bridge = regsubst($n1k_vsm::phy_if_bridge, '[.:-]+', '_', 'G') $_phy_if_bridge = regsubst($n1k_vsm::phy_if_bridge, '[.:-]+', '_', 'G')
$_phy_ip_addr = inline_template("<%= scope.lookupvar('::ipaddress_${_phy_if_bridge}') %>") $_phy_ip_addr = inline_template("<%= scope.lookupvar('::ipaddress_${_phy_if_bridge}') %>")
if $_phy_ip_addr != '' { if $_phy_ip_addr != '' and !($n1k_vsm::existing_bridge) {
$phy_ip_addr = inline_template("<%= scope.lookupvar('::ipaddress_${_phy_if_bridge}') %>") $phy_ip_addr = inline_template("<%= scope.lookupvar('::ipaddress_${_phy_if_bridge}') %>")
$phy_ip_mask = inline_template("<%= scope.lookupvar('::netmask_${_phy_if_bridge}') %>") $phy_ip_mask = inline_template("<%= scope.lookupvar('::netmask_${_phy_if_bridge}') %>")
$gw_intf = $n1k_vsm::phy_gateway $gw_intf = $n1k_vsm::phy_gateway

48
spec/classes/n1kv_vsm_pkgprep_ovscfg_spec.rb
View File

@ -40,6 +40,7 @@ describe 'n1k_vsm::pkgprep_ovscfg' do
let :facts do let :facts do
{ {
:ipaddress_eth0 => '1.1.1.1', :ipaddress_eth0 => '1.1.1.1',
:netmask_eth0 => '255.255.255.0',
:osfamily => 'RedHat' :osfamily => 'RedHat'
} }
end end
@ -52,6 +53,20 @@ describe 'n1k_vsm::pkgprep_ovscfg' do
is_expected.to contain_augeas('Augeas_modify_ifcfg-ovsbridge').with( is_expected.to contain_augeas('Augeas_modify_ifcfg-ovsbridge').with(
'name' => 'vsm-br', 'name' => 'vsm-br',
'context' => '/files/etc/sysconfig/network-scripts/ifcfg-vsm-br', 'context' => '/files/etc/sysconfig/network-scripts/ifcfg-vsm-br',
'changes' => ['set TYPE OVSBridge',
'set DEVICE vsm-br',
'set DEVICETYPE ovs',
'set OVSREQUIRES vsm-br',
'set NM_CONTROLLED no',
'set BOOTPROTO none',
'set ONBOOT yes',
'set DEFROUTE yes',
'set MTU 1500',
'set NAME vsm-br',
'set IPADDR 1.1.1.1',
'set NETMASK 255.255.255.0',
'set GATEWAY 1.1.1.3',
'set USERCTL no']
) )
end end
@ -103,6 +118,17 @@ describe 'n1k_vsm::pkgprep_ovscfg' do
is_expected.to contain_augeas('Augeas_modify_ifcfg-ovsbridge').with( is_expected.to contain_augeas('Augeas_modify_ifcfg-ovsbridge').with(
'name' => 'vsm-br', 'name' => 'vsm-br',
'context' => '/files/etc/sysconfig/network-scripts/ifcfg-vsm-br', 'context' => '/files/etc/sysconfig/network-scripts/ifcfg-vsm-br',
'changes' => ['set TYPE OVSBridge',
'set DEVICE vsm-br',
'set DEVICETYPE ovs',
'set OVSREQUIRES vsm-br',
'set NM_CONTROLLED no',
'set BOOTPROTO none',
'set ONBOOT yes',
'set DEFROUTE yes',
'set MTU 1500',
'set NAME vsm-br',
'set USERCTL no']
) )
end end
@ -152,6 +178,17 @@ describe 'n1k_vsm::pkgprep_ovscfg' do
is_expected.to contain_augeas('Augeas_modify_ifcfg-ovsbridge').with( is_expected.to contain_augeas('Augeas_modify_ifcfg-ovsbridge').with(
'name' => 'vsm-br', 'name' => 'vsm-br',
'context' => '/files/etc/sysconfig/network-scripts/ifcfg-vsm-br', 'context' => '/files/etc/sysconfig/network-scripts/ifcfg-vsm-br',
'changes' => ['set TYPE OVSBridge',
'set DEVICE vsm-br',
'set DEVICETYPE ovs',
'set OVSREQUIRES vsm-br',
'set NM_CONTROLLED no',
'set BOOTPROTO none',
'set ONBOOT yes',
'set DEFROUTE yes',
'set MTU 1500',
'set NAME vsm-br',
'set USERCTL no']
) )
end end
@ -203,6 +240,17 @@ describe 'n1k_vsm::pkgprep_ovscfg' do
is_expected.to contain_augeas('Augeas_modify_ifcfg-ovsbridge').with( is_expected.to contain_augeas('Augeas_modify_ifcfg-ovsbridge').with(
'name' => 'vsm-br', 'name' => 'vsm-br',
'context' => '/files/etc/sysconfig/network-scripts/ifcfg-vsm-br', 'context' => '/files/etc/sysconfig/network-scripts/ifcfg-vsm-br',
'changes' => ['set TYPE OVSBridge',
'set DEVICE vsm-br',
'set DEVICETYPE ovs',
'set OVSREQUIRES vsm-br',
'set NM_CONTROLLED no',
'set BOOTPROTO none',
'set ONBOOT yes',
'set DEFROUTE yes',
'set MTU 1500',
'set NAME vsm-br',
'set USERCTL no']
) )
end end