summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwu.zhihui <wu.zhihui1@zte.com.cn>2016-08-09 15:30:56 +0800
committerwu.zhihui <wu.zhihui1@zte.com.cn>2016-08-09 15:44:56 +0800
commitdbff89e9145a4841561da858b5de9df7609748f7 (patch)
tree5a97d96926e41f4095e24977a8689fa1fa6243b4
parentdf30d59db7bf598d1ecdb874f84d722445a15fde (diff)
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 <wu.zhihui1@zte.com.cn>
-rwxr-xr-xtools/ubuntu-server-cloudimg-dpdk-modify.sh4
-rw-r--r--tools/yardstick-img-dpdk-finalize.sh3
2 files changed, 5 insertions, 2 deletions
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"