Revert "Updates scenario files for hunter branch"

[apex.git] / apex / overcloud / config.py

diff --git a/apex/overcloud/config.py b/apex/overcloud/config.py
index acec532..e8d8fbb 100644 (file)
--- a/apex/overcloud/config.py
+++ b/apex/overcloud/config.py
@@ -44,10 +44,17 @@ def create_nic_template(network_settings, deploy_settings, role, template_dir,
     ovs_dpdk_br = ''
     if ds['dataplane'] == 'fdio':
         nets['tenant']['nic_mapping'][role]['phys_type'] = 'vpp_interface'
-        if ds['sdn_controller'] == 'opendaylight' and role == 'compute':
+        if ds['sdn_controller'] == 'opendaylight':
+            if role == 'compute':
+                nets['external'][0]['nic_mapping'][role]['phys_type'] = \
+                    'vpp_interface'
+                ext_net = 'vpp_interface'
+            if ds.get('dvr') is True:
+                nets['admin']['nic_mapping'][role]['phys_type'] = \
+                    'linux_bridge'
+        else:
             nets['external'][0]['nic_mapping'][role]['phys_type'] = \
-                'vpp_interface'
-            ext_net = 'vpp_interface'
+                'linux_bridge'
     elif ds['dataplane'] == 'ovs_dpdk':
         ovs_dpdk_br = 'br-phy'
     if (ds.get('performance', {}).get(role.title(), {}).get('vpp', {})