diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-04-18 15:47:59 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-04-21 00:29:19 -0400 |
| commit | c03181b38fb477707f2aa66dccac7a816b13124d (patch) | |
| tree | 2755a01253c24c4e23e12640b5698335a83273c9 /build/instack.sh | |
| parent | 92e4b9310b8582bcd751ce0f8fe3fab98d195d71 (diff) | |
Fixes SDNVPN and SFC bugs
Changes Include:
- ODL beta SR2 image updated which contains fixes for SFC classifier and SDNVPN
- SDNVPN ODL boot features now set as odl-vpnservice-openstack
- SDNVPN Tunnel setup script now copied to/executes on nodes for
configuring OVS with SDNVPN
Change-Id: I290a999c07f59eb04d75c39dd31280fb39a41d29
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/instack.sh')
| -rwxr-xr-x | build/instack.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/instack.sh b/build/instack.sh index 5982ce95..5ace95ca 100755 --- a/build/instack.sh +++ b/build/instack.sh @@ -276,7 +276,7 @@ enabled=1 gpgcheck=0 EOF -odlrpm=opendaylight-4.2.0-1.20160407.144137180.el7.noarch.rpm +odlrpm=opendaylight-4.2.0-1.20160420.023809294.el7.noarch.rpm LIBGUESTFS_BACKEND=direct virt-customize --upload ${rdo_images_uri/file:\/\//}/$odlrpm:/tmp/ \ -a overcloud-full-opendaylight.qcow2 opendaylight=/tmp/$odlrpm @@ -304,6 +304,11 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload ../opnfv-tripleo-heat-template --run-command "cd /usr/share/openstack-tripleo-heat-templates/ && patch -Np1 < /tmp/opnfv-tripleo-heat-templates.patch" \ -a instack.qcow2 +# SDNVPN - Copy tunnel setup script +wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py +LIBGUESTFS_BACKEND=direct virt-customize --upload ./setup_TEPs.py:/tmp \ + -a overcloud-full-opendaylight.qcow2 + # REMOVE ME AFTER Brahmaputra LIBGUESTFS_BACKEND=direct virt-customize --upload ../puppet-neutron-force-metadata.patch:/tmp \ --run-command "cd /etc/puppet/modules/neutron && patch -Np1 < /tmp/puppet-neutron-force-metadata.patch" \ |