From 6bfab6c7e79ed029a9102ff7b7955b0a71f13c6d Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Sun, 6 Aug 2017 21:55:44 -0400
Subject: Add os-odl-fdio-dvr support

apex-tripleo-heat-templates: I6a83c9e2deeb0df9a3ab09a707c9c64aa84da55e
apex-puppet-tripleo: I2025e3157b97b376b63002003ca17c7206aba546

JIRA: APEX-466

Change-Id: Iedb75994d35b5dc1dd5d5ce1a57277c8f3729dfd
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 build/overcloud-full.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'build/overcloud-full.sh')

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 403ab8ee..23d401fb 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -41,8 +41,8 @@ rm -rf vsperf vsperf.tar.gz
 git clone https://gerrit.opnfv.org/gerrit/vswitchperf vsperf
 tar czf vsperf.tar.gz vsperf
 
-# Increase disk size by 900MB to accommodate more packages
-qemu-img resize overcloud-full_build.qcow2 +900MB
+# Increase disk size by 1200MB to accommodate more packages
+qemu-img resize overcloud-full_build.qcow2 +1200MB
 
 # expand file system to max disk size
 # installing forked apex-puppet-tripleo
@@ -118,9 +118,6 @@ for package in ${fdio_pkgs[@]}; do
   fdio_pkg_str+=" --upload ${BUILD_DIR}/${package##*/}:/root/fdio/"
 done
 
-# Increase disk size by 900MB to accommodate more packages
-qemu-img resize overcloud-full_build.qcow2 +900MB
-
 # upload dpdk rpms but do not install
 # install fd.io yum repo and packages
 # upload puppet fdio
@@ -131,6 +128,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     $dpdk_pkg_str \
     --upload ${BUILD_DIR}/puppet-fdio.tar.gz:/etc/puppet/modules \
     --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \
+    --upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/ \
     --run-command "mkdir /root/fdio" \
     --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio \
     $fdio_pkg_str \
-- 
cgit 1.2.3-korg