From 4d88340cb582a0fda9b6ac9174a41c7b4c28d655 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Sat, 14 Apr 2018 09:35:37 -0400 Subject: nosdn-fdio scenario fixes - Skip lookup for tap interfaces - Update l3_hosts field in vpp ml2 section Change-Id: I231054a433eb7e598a6e24f6eaea02d476e776de Signed-off-by: Feng Pan --- lib/puppet/parser/functions/vpp_physnet_mapping.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/puppet/parser/functions/vpp_physnet_mapping.rb b/lib/puppet/parser/functions/vpp_physnet_mapping.rb index 1c86a23..cd05f56 100644 --- a/lib/puppet/parser/functions/vpp_physnet_mapping.rb +++ b/lib/puppet/parser/functions/vpp_physnet_mapping.rb @@ -6,10 +6,14 @@ module Puppet::Parser::Functions unless mapping.length == 2 raise Puppet::ParseError, "Invalid physnet mapping format: #{item}. Expecting 'physnet:interface_name'" end - if defined? call_function - vpp_int = call_function('hiera', [mapping[1]]) + if mapping[1].start_with?("tap") + vpp_int = mapping[1] else - vpp_int = function_hiera([mapping[1]]) + if defined? call_function + vpp_int = call_function('hiera', [mapping[1]]) + else + vpp_int = function_hiera([mapping[1]]) + end end if vpp_int.to_s.strip.empty? raise Puppet::ParseError, "VPP interface mapped to #{mapping[1]} is not found." -- cgit 1.2.3-korg