From a6d5ccd02cc16ed3f44bce3c2a0ec9cea6ae8656 Mon Sep 17 00:00:00 2001 From: Ricardo Noriega Date: Mon, 21 Nov 2016 15:26:50 +0100 Subject: Updating OpenDaylight image script to use RDO trunk BGPVPN package. Once this package is included in tripleo-puppet-elements, this virt-customize won't be neccesary Change-Id: I599081c1737c23d65f2c25933beff6d41d8ee252 Signed-off-by: Ricardo Noriega --- build/overcloud-opendaylight.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 4152c195..f7f8958d 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -52,6 +52,17 @@ enabled=1 gpgcheck=0 EOF +#BGPVPN Repo +cat > /tmp/bgpvpn.repo << EOF +[bgpvpn] +name=bgpvpn +baseurl=https://trunk.rdoproject.org/centos7/consistent/ +includepkgs=python2-networking-bgpvpn +enabled=1 +gpgcheck=0 +priority=1 +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 @@ -68,7 +79,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "yum install --downloadonly --downloaddir=/root/master/ opendaylight" \ --upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \ --install opendaylight,python-networking-odl \ - --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \ + --upload /tmp/bgpvpn.repo:/etc/yum.repos.d/bgpvpn.repo \ + --install python-networking-bgpvpn \ --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 \ -- cgit 1.2.3-korg