aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYichen Wang <yicwang@cisco.com>2019-09-10 14:06:19 -0700
committerYichen Wang <yicwang@cisco.com>2019-09-10 16:54:46 -0700
commit98aac3b7ed5060d2e498d4ab545482a525339120 (patch)
tree517a4a7d47fc3bfe50004420ba94b5d2c2ab9a84
parent50a01aacb26028cf23e7ee2583c368adff3a4b2e (diff)
[NFVBENCH-151] Allocate hugepages on two NUMAs in nfvbenchvmHEAD3.6.1master
Change-Id: I001db6d15453bf3af8ad109d1497bc68e7c104a7 Signed-off-by: Yichen Wang <yicwang@cisco.com>
-rw-r--r--docker/Dockerfile2
-rwxr-xr-xnfvbenchvm/dib/build-image.sh2
-rwxr-xr-xnfvbenchvm/dib/elements/nfvbenchvm/finalise.d/51-add-cpu-isolation2
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 78b8484..6d69465 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@
FROM ubuntu:16.04
ENV TREX_VER "v2.61"
-ENV VM_IMAGE_VER "0.9"
+ENV VM_IMAGE_VER "0.10"
# Note: do not clone with --depth 1 as it will cause pbr to fail extracting the nfvbench version
# from the git tag
diff --git a/nfvbenchvm/dib/build-image.sh b/nfvbenchvm/dib/build-image.sh
index 588e454..fce298c 100755
--- a/nfvbenchvm/dib/build-image.sh
+++ b/nfvbenchvm/dib/build-image.sh
@@ -30,7 +30,7 @@ set -e
gs_url=artifacts.opnfv.org/nfvbench/images
# image version number
-__version__=0.9
+__version__=0.10
image_name=nfvbenchvm_centos-$__version__
# if image exists skip building
diff --git a/nfvbenchvm/dib/elements/nfvbenchvm/finalise.d/51-add-cpu-isolation b/nfvbenchvm/dib/elements/nfvbenchvm/finalise.d/51-add-cpu-isolation
index eab5817..f81485d 100755
--- a/nfvbenchvm/dib/elements/nfvbenchvm/finalise.d/51-add-cpu-isolation
+++ b/nfvbenchvm/dib/elements/nfvbenchvm/finalise.d/51-add-cpu-isolation
@@ -1,4 +1,4 @@
#!/bin/bash
grubby --update-kernel=ALL --args="isolcpus=1 rcu_nocbs=1 nohz=on nohz_full=1 nmi_watchdog=0"
-grubby --update-kernel=ALL --args="default_hugepagesz=1G hugepagesz=1G hugepages=1"
+grubby --update-kernel=ALL --args="default_hugepagesz=1G hugepagesz=1G hugepages=2"