diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-01-25 14:39:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-25 14:39:26 +0000 |
| commit | 47f3e38031fc35fb14982b62633b30a92f16a820 (patch) | |
| tree | 2ab9d25ba68c30742fb9d7cef0c1c62553328b85 | |
| parent | ed3c1140b28494a1de9fd2b7e25b8df08f716797 (diff) | |
| parent | c3690935e47740cab880102fc08df0222781b917 (diff) | |
Merge "[BGPVPN] Remove setup_TEPS"
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 5a05ea40..0b002111 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -63,9 +63,6 @@ gpgcheck=0 priority=1 EOF -# SDNVPN - Copy tunnel setup script -curl -fO https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py - # OpenDaylight Puppet Module rm -rf puppet-opendaylight git clone -b master https://github.com/dfarrell07/puppet-opendaylight @@ -90,7 +87,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --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" \ --install honeycomb \ - --upload ${BUILD_DIR}/setup_TEPs.py:/tmp \ --upload ${BUILD_DIR}/puppet-opendaylight.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \ -a overcloud-full-opendaylight_build.qcow2 |