From 6557a832f652ac8a57ef9ad4c7b5cded3f9a7db2 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Fri, 28 Apr 2017 04:26:39 -0400 Subject: Update VPP/ODL versions for FDIO scenarios Pin the same set of FDIO and OpenDaylight versions for all fdio scenarios. Note that fdio_netvirt-fdio still uses a customized ODL version. JIRA: APEX-451 Change-Id: Ic5ac5aeead9967fe383447e23653276cde2dfe60 Signed-off-by: Feng Pan --- build/overcloud-opendaylight.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'build/overcloud-opendaylight.sh') diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index ae6d5fe6..2772ced3 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -90,10 +90,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_DIR}/opendaylight_master.repo:/etc/yum.repos.d/opendaylight.repo \ --run-command "yum install --downloadonly --downloaddir=/root/master/ opendaylight" \ --upload ${BUILD_DIR}/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \ - --run-command "wget ${fdio_l2_uri_base}/honeycomb-1.17.04-2439.noarch.rpm -O /root/fdio_l2/honeycomb-1.17.04-2439.noarch.rpm" \ - --run-command "wget ${fdio_l2_uri_base}/opendaylight-6.0.0-0.1.20170228snap4111.el7.noarch.rpm -O /root/fdio_l2/opendaylight-6.0.0-0.1.20170228snap4111.el7.noarch.rpm" \ + --run-command "wget ${honeycomb_pkg} -O /root/fdio/${honeycomb_pkg##*/}" \ --install opendaylight,python-networking-odl \ - --run-command "yum install -y /root/fdio_l2/honeycomb-1.17.04-2439.noarch.rpm" \ + --run-command "yum install -y /root/fdio/${honeycomb_pkg##*/}" \ --upload ${BUILD_DIR}/puppet-opendaylight.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \ --upload ${BUILD_DIR}/networking-bgpvpn.tar.gz:/root/ \ -- cgit 1.2.3-korg