diff options
author | Feng Pan <fpan@redhat.com> | 2018-04-14 09:35:37 -0400 |
---|---|---|
committer | Feng Pan <fpan@redhat.com> | 2018-04-15 15:07:49 -0400 |
commit | 4d88340cb582a0fda9b6ac9174a41c7b4c28d655 (patch) | |
tree | 6f268cc3818c9937beed42ed0ee4609ab33b4183 /lib/puppet/parser/functions | |
parent | b779f161972bf52055a8074432d82fadc12d730a (diff) |
- Skip lookup for tap interfaces
- Update l3_hosts field in vpp ml2 section
Change-Id: I231054a433eb7e598a6e24f6eaea02d476e776de
Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib/puppet/parser/functions')
-rw-r--r-- | lib/puppet/parser/functions/vpp_physnet_mapping.rb | 10 |
1 files changed, 7 insertions, 3 deletions
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." |