diff options
Diffstat (limited to 'apex')
-rw-r--r-- | apex/overcloud/deploy.py | 4 | ||||
-rw-r--r-- | apex/tests/test_apex_overcloud_deploy.py | 2 |
2 files changed, 2 insertions, 4 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: diff --git a/apex/tests/test_apex_overcloud_deploy.py b/apex/tests/test_apex_overcloud_deploy.py index ae2e8f0b..63cd326e 100644 --- a/apex/tests/test_apex_overcloud_deploy.py +++ b/apex/tests/test_apex_overcloud_deploy.py @@ -405,7 +405,7 @@ class TestOvercloudDeploy(unittest.TestCase): prep_env(ds, ns, inv, 'opnfv-env.yml', '/net-env.yml', '/tmp') output = out.getvalue().strip() assert_in('NeutronVPPAgentPhysnets: ' - '\'datacentre:tenant_nic,external:tap0\'', + '\'datacentre:tenant_nic\'', output) assert_in('NeutronVPPAgentPhysnets', output) finally: |