diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-09-01 04:24:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-01 04:24:56 +0000 |
| commit | c81b847004aeed37931ee2e8ba53ebc193598fd0 (patch) | |
| tree | 7f54eb7788707d4cbefc9704419d06ed6acc449b | |
| parent | 5398acb7f2fa497e0666912b97b6e41cf87d3d14 (diff) | |
| parent | 9a23f461d62217a362d9a109e9312c10ca63006f (diff) | |
Merge "Fix deployment errors for odl-fdio scenarios"
| -rw-r--r-- | apex/overcloud/config.py | 4 | ||||
| -rw-r--r-- | apex/overcloud/overcloud_deploy.py | 2 |
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") |