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>

diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index 03e5652..b6dfa0d 100644 (file)
--- 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 ae2e8f0..63cd326 100644 (file)
--- 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:

diff --git a/build/variables.sh b/build/variables.sh
index 0ccf484..d1edafe 100644 (file)
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -45,19 +45,19 @@ kvmfornfv_kernel_rpm="kvmfornfv-4bfeded9-apex-kernel-4.4.50_rt62_centos.x86_64.r
 calipso_uri_base="https://git.opnfv.org/calipso/plain/app/install"
 calipso_script="calipso-installer.py"
 
-#netvpp_repo="https://github.com/openstack/networking-vpp"
-netvpp_repo="https://github.com/fepan/networking-vpp"
-netvpp_branch="test-fdio-fix"
+netvpp_repo="https://github.com/openstack/networking-vpp"
+netvpp_branch="master"
 netvpp_commit=$(git ls-remote ${netvpp_repo} ${netvpp_branch} | awk '{print substr($1,1,7)}')
 netvpp_pkg=python-networking-vpp-18.04-1.git${NETVPP_COMMIT}$(rpm -E %dist).noarch.rpm
 
 gluon_rpm=gluon-0.0.1-1_20170302.noarch.rpm
 
 nosdn_vpp_rpms=(
-'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp/18.01.1-release.x86_64/vpp-18.01.1-release.x86_64.rpm'
-'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-plugins/18.01.1-release.x86_64/vpp-plugins-18.01.1-release.x86_64.rpm'
-'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-lib/18.01.1-release.x86_64/vpp-lib-18.01.1-release.x86_64.rpm'
-'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-api-python/18.01.1-release.x86_64/vpp-api-python-18.01.1-release.x86_64.rpm'
+'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp/18.04-release.x86_64/vpp-18.04-release.x86_64.rpm'
+'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-plugins/18.04-release.x86_64/vpp-plugins-18.04-release.x86_64.rpm'
+'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-lib/18.04-release.x86_64/vpp-lib-18.04-release.x86_64.rpm'
+'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-api-python/18.04-release.x86_64/vpp-api-python-18.04-release.x86_64.rpm'
+'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-selinux-policy/18.04-release.x86_64/vpp-selinux-policy-18.04-release.x86_64.rpm'
 )
 
 CENTOS_UPDATE="http://artifacts.opnfv.org/apex/fraser/centos"