Merge "Fix deployment errors for odl-fdio scenarios"

diff --git a/apex/overcloud/config.py b/apex/overcloud/config.py
index 6e116de..acec532 100644 (file)
--- a/apex/overcloud/config.py
+++ b/apex/overcloud/config.py
@@ -44,7 +44,7 @@ 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':
+        if ds['sdn_controller'] == 'opendaylight' and role == 'compute':
             nets['external'][0]['nic_mapping'][role]['phys_type'] = \
                 'vpp_interface'
             ext_net = 'vpp_interface'
@@ -54,7 +54,7 @@ def create_nic_template(network_settings, deploy_settings, role, template_dir,
             .get('uio-driver')):
         nets['tenant']['nic_mapping'][role]['uio-driver'] =\
             ds['performance'][role.title()]['vpp']['uio-driver']
-        if ds['sdn_controller'] == 'opendaylight':
+        if ds['sdn_controller'] == 'opendaylight' and role == 'compute':
             nets['external'][0]['nic_mapping'][role]['uio-driver'] =\
                 ds['performance'][role.title()]['vpp']['uio-driver']
     if (ds.get('performance', {}).get(role.title(), {}).get('vpp', {})

diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py
index 518df0d..6065214 100644 (file)
--- a/apex/overcloud/overcloud_deploy.py
+++ b/apex/overcloud/overcloud_deploy.py
@@ -85,7 +85,7 @@ def build_sdn_env_list(ds, sdn_map, env_list=None):
     if len(env_list) == 0:
         try:
             env_list.append(os.path.join(
-                con.THT_ENV_DIR, sdn_map[ds['sdn_controller']]['default']))
+                con.THT_ENV_DIR, sdn_map['default']))
         except KeyError:
             logging.warning("Unable to find default file for SDN")