diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-05-30 20:49:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-30 20:49:29 +0000 |
| commit | fd7f3285fa0d872f3eb23ded248e45bf720ebda7 (patch) | |
| tree | 9fed182ca183e82d97965287d7adbb7bb355a1d1 /apex/overcloud/deploy.py | |
| parent | 5ff098787664eb141c3c169bdc194c188520ef89 (diff) | |
| parent | 3436f763ce4dd795fadc32d6546b53f9c856b3bb (diff) | |
Merge "nosdn-fdio scenarios fixes" into stable/fraser
Diffstat (limited to 'apex/overcloud/deploy.py')
| -rw-r--r-- | apex/overcloud/deploy.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index 03e56529..b6dfa0d0 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -547,10 +547,8 @@ def prep_env(ds, ns, inv, opnfv_env, net_env, tmp_dir): ns['domain_name'])) elif not ds_opts['sdn_controller'] and ds_opts['dataplane'] == 'fdio': if 'NeutronVPPAgentPhysnets' in line: - # VPP interface tap0 will be used for external network - # connectivity. output_line = (" NeutronVPPAgentPhysnets: " - "'datacentre:{},external:tap0'" + "'datacentre:{}'" .format(tenant_nic['Controller'])) elif ds_opts['sdn_controller'] == 'opendaylight' and ds_opts.get( 'dvr') is True: |