summaryrefslogtreecommitdiffstats
path: root/build/overcloud-opendaylight.sh
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-04-28 04:26:39 -0400
committerFeng Pan <fpan@redhat.com>2017-04-28 04:26:39 -0400
commit6557a832f652ac8a57ef9ad4c7b5cded3f9a7db2 (patch)
tree5159cde0441da171fe99d750ccc954c1a00ddf5d /build/overcloud-opendaylight.sh
parent168e9e92a39d03b5455938dfa7269017602e99e8 (diff)
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 <fpan@redhat.com>
Diffstat (limited to 'build/overcloud-opendaylight.sh')
-rwxr-xr-xbuild/overcloud-opendaylight.sh5
1 files changed, 2 insertions, 3 deletions
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/ \