From 2fff43c7d76c7cbd1297ac1fedd6f08270c97391 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Mon, 6 Aug 2018 14:58:21 +0800 Subject: Get VIRT_NUMBER from DHA file JIRA: COMPASS-611 Change-Id: I498ea9517ff4f29c0369b8339b5e625c4131bd00 Signed-off-by: Harry Huang --- deploy/conf/virtual.conf | 1 - deploy/config_parse.py | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy/conf/virtual.conf b/deploy/conf/virtual.conf index dcee7d30..f49f0c6b 100644 --- a/deploy/conf/virtual.conf +++ b/deploy/conf/virtual.conf @@ -1,4 +1,3 @@ -export VIRT_NUMBER=${VIRT_NUMBER:-5} export VIRT_CPUS=${VIRT_CPUS:-8} export VIRT_MEM=${VIRT_MEM:-16384} export VIRT_DISK=${VIRT_DISK:-200G} diff --git a/deploy/config_parse.py b/deploy/config_parse.py index 3ee0d864..9cdf1acb 100644 --- a/deploy/config_parse.py +++ b/deploy/config_parse.py @@ -127,6 +127,9 @@ def export_dha_file(dha, dha_file, ofile): if len(value) > 0: env.update({'HOST_MACS': value}) + if dha.get('TYPE', "virtual") == "virtual": + env.update({'VIRT_NUMBER': len(dha['hosts'])}) + export_env_dict(env, ofile) -- cgit 1.2.3-korg