Change VPP tap0 config for nosdn-fdio scenario

We need to configure controller node VPP to use tap0 interface
for external network. Previously this was configured for all nodes,
which is not desirable.

Change-Id: Ia33234b1c6eddf787d5e4ab62c22ddc8a18b82f3
Signed-off-by: Feng Pan <fpan@redhat.com>

diff --git a/manifests/profile/base/neutron/agents/vpp.pp b/manifests/profile/base/neutron/agents/vpp.pp
index 0b06b57..93ae689 100644 (file)
--- a/manifests/profile/base/neutron/agents/vpp.pp
+++ b/manifests/profile/base/neutron/agents/vpp.pp
@@ -54,15 +54,18 @@ class tripleo::profile::base::neutron::agents::vpp(
   }
 
   if $step >= 4 {
+    $physnet_mapping_str = vpp_physnet_mapping($physnet_mapping)
     if $::hostname in hiera('controller_node_names') {
       $service_plugins = hiera('neutron::service_plugins')
+      $real_physnet_mapping = "${physnet_mapping_str},external:tap0"
     } else {
       $service_plugins = undef
+      $real_physnet_mapping = $physnet_mapping_str
     }
     class { '::neutron::agents::ml2::vpp':
       etcd_host       => $etcd_host,
       etcd_port       => $etcd_port,
-      physnets        => vpp_physnet_mapping($physnet_mapping),
+      physnets        => $real_physnet_mapping,
       type_drivers    => $type_drivers,
       service_plugins => $service_plugins,
     }