summaryrefslogtreecommitdiffstats
path: root/build/overcloud-full.sh
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-11-30 02:04:21 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-30 02:04:21 +0000
commit916ff520b1626ae8cd4f93ccc55080164dcee9fa (patch)
tree5f7079c3a2e5ac877762a7a6283d8351d53b8e4a /build/overcloud-full.sh
parent52edf198d0f848d9945a502da6c861ef9a043c61 (diff)
parent7c3da5d39dbf71429b0ac31c8b790e102031d645 (diff)
Merge "Updates VPP packages to latest master version" into stable/colorado
Diffstat (limited to 'build/overcloud-full.sh')
-rwxr-xr-xbuild/overcloud-full.sh19
1 files changed, 11 insertions, 8 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 8ec7af6b..4b348565 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -50,12 +50,6 @@ for package in ${dpdk_rpms[@]}; do
dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
done
-fdio_pkg_str=''
-for package in ${fdio_pkgs[@]}; do
- wget "$fdio_uri_base/$package"
- fdio_pkg_str+=" --upload $package:/root/fdio"
-done
-
# tar up the congress puppet module
rm -rf puppet-congress
git clone -b stable/mitaka https://github.com/radez/puppet-congress
@@ -95,6 +89,15 @@ popd > /dev/null
# replace repo with latest delorean mitaka
wget https://trunk.rdoproject.org/centos7-mitaka/current-passed-ci/delorean.repo
+# Master FD.IO Repo
+cat > /tmp/fdio.repo << EOF
+[fdio-master]
+name=fd.io master branch latest merge
+baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/
+enabled=1
+gpgcheck=0
+EOF
+
# installing forked opnfv-puppet-tripleo
# enable connection tracking for protocal sctp
# upload dpdk rpms but do not install
@@ -116,9 +119,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \
--run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
--run-command "mkdir /root/dpdk_rpms" \
- --run-command "mkdir /root/fdio" \
+ --upload /tmp/fdio.repo:/etc/yum.repos.d/fdio.repo \
$dpdk_pkg_str \
- $fdio_pkg_str \
+ --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp vpp-devel vpp-lib vpp-python-api vpp-plugins" \
--upload ../networking-vpp.noarch.rpm:/root/fdio \
--run-command "pip install distro flask_restful" \
--run-command "yum install -y etcd" \