From dbff89e9145a4841561da858b5de9df7609748f7 Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Tue, 9 Aug 2016 15:30:56 +0800 Subject: Two modifications for DPDK image 1. workaround for creating snapshot 2. modify the parameters of Hugepage in vm JIRA:YARDSTICK-233 Change-Id: I9cea76ed30dabe4fe2cb644e58ed0acd7dd8ecde Signed-off-by: wu.zhihui --- tools/ubuntu-server-cloudimg-dpdk-modify.sh | 4 ++-- tools/yardstick-img-dpdk-finalize.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/ubuntu-server-cloudimg-dpdk-modify.sh b/tools/ubuntu-server-cloudimg-dpdk-modify.sh index edcbeb61a..aa4e252ea 100755 --- a/tools/ubuntu-server-cloudimg-dpdk-modify.sh +++ b/tools/ubuntu-server-cloudimg-dpdk-modify.sh @@ -33,8 +33,8 @@ grep wily /etc/apt/sources.list && \ # Force apt to use ipv4 due to build problems on LF POD. echo 'Acquire::ForceIPv4 "true";' > /etc/apt/apt.conf.d/99force-ipv4 -echo 'GRUB_CMDLINE_LINUX="resume=/dev/sda1 default_hugepagesz=1G hugepagesz=1G hugepages=1 iommu=on iommu=pt intel_iommu=on"' >> /etc/default/grub -echo 'vm.nr_hugepages=512' >> /etc/sysctl.conf +echo 'GRUB_CMDLINE_LINUX="resume=/dev/sda1 default_hugepagesz=1G hugepagesz=1G hugepages=2 iommu=on iommu=pt intel_iommu=on"' >> /etc/default/grub +echo 'vm.nr_hugepages=1024' >> /etc/sysctl.conf echo 'huge /mnt/huge hugetlbfs defaults 0 0' >> vi /etc/fstab mkdir /mnt/huge diff --git a/tools/yardstick-img-dpdk-finalize.sh b/tools/yardstick-img-dpdk-finalize.sh index b9ea83e11..7a450e269 100644 --- a/tools/yardstick-img-dpdk-finalize.sh +++ b/tools/yardstick-img-dpdk-finalize.sh @@ -29,6 +29,9 @@ do fi done +# workaround: Without wait time, the file size of pktgen is zero in the snapshot. +sleep 60 + status=$(nova image-create --poll $stackname $new_image_name) if [[ "$status" =~ "Finished" ]];then echo "$new_image_name finished" -- cgit 1.2.3-korg