summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-08-31 13:59:04 -0400
committerFeng Pan <fpan@redhat.com>2017-08-31 13:59:04 -0400
commit9a23f461d62217a362d9a109e9312c10ca63006f (patch)
tree5ba96653d1c55cc4bc1163278f91a8804c2cb683
parent1ae72825a39a3b457ebdbeccfeadf3de6ce9018f (diff)
Fix deployment errors for odl-fdio scenarios
- Changed NIC template generation to only configure VPP interface for external network on compute nodes - Fixed overcloud deploy environment file error when deploying odl-fdio Change-Id: I4fb07073b0dffc35ef09a5e32deb8470f5ee8347 Signed-off-by: Feng Pan <fpan@redhat.com>
-rw-r--r--apex/overcloud/config.py4
-rw-r--r--apex/overcloud/overcloud_deploy.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/apex/overcloud/config.py b/apex/overcloud/config.py
index 6e116de2..acec5323 100644
--- 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 518df0dd..60652146 100644
--- 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")