diff options
| -rw-r--r-- | lib/puppet/parser/functions/vpp_physnet_mapping.rb | 10 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/plugins/ml2/vpp.pp | 2 |
2 files changed, 8 insertions, 4 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." diff --git a/manifests/profile/base/neutron/plugins/ml2/vpp.pp b/manifests/profile/base/neutron/plugins/ml2/vpp.pp index 0312eff..f90841a 100644 --- a/manifests/profile/base/neutron/plugins/ml2/vpp.pp +++ b/manifests/profile/base/neutron/plugins/ml2/vpp.pp @@ -42,7 +42,7 @@ class tripleo::profile::base::neutron::plugins::ml2::vpp ( if $step >= 4 { if $::hostname in hiera('controller_node_names') { - $l3_hosts = strip(hiera('controller_node_names').split(',')[0]) + $l3_hosts = "${hiera('controller_node_names').split(',')[0]}.${::domain}" } else { $l3_hosts = undef } |