diff options
| author |   Feng Pan <fpan@redhat.com> | 2018-04-13 22:22:40 -0400 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2018-04-19 04:16:11 +0000 |
| commit | d98ecbac0bfbe4157efea5a00836a541ac681b7c (patch) | |
| tree | 996bed129d46aa32ec1d0945849da760fdf95793 /build/variables.sh | |
| parent | e5caea32820466d5870f11ba72255b8f77591a62 (diff) | |
Fix nosdn fdio scenario
- Update networking-vpp to use master branch
- Update THT vpp ml2 environment file with correct parameters
- Update external network creation command to use 'externa' as
provider network name.
- Remove vpp network settings file as it's not used
apex-tripleo-heat-templates: Ia25db8456f1ad6beb96c7b9b5f318b166ef4576a
apex-puppet-tripleo: I231054a433eb7e598a6e24f6eaea02d476e776de
Change-Id: I4a1f68c75ae3b7d2a5b347d05abf0d025e8b116b
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit 5acf4e708c68147ef20c67f8d4648e6027c1e20d)
Diffstat (limited to 'build/variables.sh')
| -rw-r--r-- | build/variables.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build/variables.sh b/build/variables.sh index c6bddc02..1c118442 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -44,10 +44,11 @@ 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_branch="18.01" +#netvpp_repo="https://github.com/openstack/networking-vpp" +netvpp_repo="https://github.com/fepan/networking-vpp" +netvpp_branch="test-fdio-fix" netvpp_commit=$(git ls-remote ${netvpp_repo} ${netvpp_branch} | awk '{print substr($1,1,7)}') -netvpp_pkg=python-networking-vpp-18.01-1.git${NETVPP_COMMIT}$(rpm -E %dist).noarch.rpm +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 |