x
/
fuel-plugin-opendaylight
Code Issues Proposed changes

Support dpdk enabled computes in vlan mode 

Bridge for private/tenant network should be used as-is since
physical(dpdk) interface is being connected directly to br-prv ovs bridge.

Closes-Bug: #1656924
Change-Id: Ifb87b55c8d01af12a079dcfe561b4581a91a4a0b
This commit is contained in:
Michael Polenchuk 2017-01-18 17:31:27 +04:00
parent 3231445194
commit 5724fdff15
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
deployment_scripts/puppet/modules/opendaylight/lib/puppet/parser/functions/odl_network_scheme.rb
View File

@ -9,6 +9,7 @@ module Puppet::Parser::Functions
# override network_scheme
odl = function_hiera(['opendaylight'])
network_scheme = function_hiera(['network_scheme'])
dpdk_enabled = function_hiera_hash(['dpdk', {}])['enabled']
if odl['enable_bgpvpn']
# If bgpvpn extensions are enabled br-ex is not needed
@ -21,9 +22,17 @@ module Puppet::Parser::Functions
endpoints = network_scheme['endpoints']
transformations = network_scheme['transformations']
transformations.delete_if { |action| action['action'] == 'add-br' and delete_bridges.include?(action['name']) }
transformations.delete_if { |action| action['action'] == 'add-patch' and not (action['bridges'] & delete_bridges).empty? }
transformations.delete_if { |action| action['action'] == 'add-port' and delete_bridges.include?(action['bridge']) }
if dpdk_enabled
transformations.each do |action|
action['name'] = 'br-aux' if 'add-br' == action['action'] && delete_bridges.include?(action['name'])
action['bridge'] = 'br-aux' if 'add-port' == action['action'] && delete_bridges.include?(action['bridge'])
end
else
transformations.delete_if { |action| action['action'] == 'add-br' and delete_bridges.include?(action['name']) }
transformations.delete_if { |action| action['action'] == 'add-patch' and not (action['bridges'] & delete_bridges).empty? }
transformations.delete_if { |action| action['action'] == 'add-port' and delete_bridges.include?(action['bridge']) }
end
if not odl['enable_bgpvpn']
debug "Changing network_scheme for the non bgpvpn case."