diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2018-08-14 09:23:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-14 09:23:10 +0000 |
| commit | 381a1df096e1f358bef8de1dbaa7593379357f22 (patch) | |
| tree | 2bb83c7481f7333e6983a1e981a7137606c770fa | |
| parent | d1005a8f88160342c907b383a1005b85b5bc9308 (diff) | |
| parent | 2fff43c7d76c7cbd1297ac1fedd6f08270c97391 (diff) | |
Merge "Get VIRT_NUMBER from DHA file"
| -rw-r--r-- | deploy/conf/virtual.conf | 1 | ||||
| -rw-r--r-- | deploy/config_parse.py | 3 |
2 files changed, 3 insertions, 1 deletions
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) |