summaryrefslogtreecommitdiffstats
path: root/build/overcloud-opendaylight.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-07-19 16:28:43 -0400
committerTim Rozet <trozet@redhat.com>2016-07-20 14:17:34 -0400
commit629fe0fd1eb566636db6dd15b87490844f429597 (patch)
tree5de3eed2ff01aa7829ca1e553d163ff9cac26b8b /build/overcloud-opendaylight.sh
parent40925d0cdc63e557ef04569642875cd07b8ed7ce (diff)
Fixes bgpvpn scenario
We had a regression where we missed adding bgpvpn code back into master. opnfv-tht-pr: 45 JIRA: APEX-200 Change-Id: I44da1d653e13c48f276ad29daac1eb6f4f2d629b Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/overcloud-opendaylight.sh')
-rwxr-xr-xbuild/overcloud-opendaylight.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 4f8a3ff0..3e403bbc 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -36,6 +36,9 @@ enabled=1
gpgcheck=0
EOF
+# 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
+
# install ODL packages
# install Jolokia for ODL HA
# Patch in OPNFV custom puppet-tripleO
@@ -47,6 +50,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \
--run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \
--run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \
+ --upload ./setup_TEPs.py:/tmp \
-a overcloud-full-opendaylight_build.qcow2
# Move these two lines above the -a overcloud-full-opendaylight_build.qcow2 when the patch has been rebased