summaryrefslogtreecommitdiffstats
path: root/apex/overcloud/deploy.py
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2018-04-19 15:27:29 -0400
committerFeng Pan <fpan@redhat.com>2018-05-30 11:53:34 -0400
commit3436f763ce4dd795fadc32d6546b53f9c856b3bb (patch)
tree3de58469b5b99e8a7c77c67a683691e36a693c80 /apex/overcloud/deploy.py
parent2a53c61bb68ce13fc51c9f58a712a8f41b34a2b0 (diff)
nosdn-fdio scenarios fixes
- Set DatabaseSyncTimeout to 1800 to avoid db_sync timeout. - Add workaround for nova vif plug failure - Update vpp version - Change tap0 interface config to be on controller node only - Change networking-vpp repo back to upstream apex-tripleo-heat-templates: I14af87378b8ac7a5d10d31d2652a65d535e2ec0c apex-puppet-tripleo: Ia33234b1c6eddf787d5e4ab62c22ddc8a18b82f3 Change-Id: I843bf5b420f7994e451a01d64eacb6193df97d75 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'apex/overcloud/deploy.py')
-rw-r--r--apex/overcloud/deploy.py4
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: