diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-03-13 23:30:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-13 23:30:47 +0000 |
| commit | 69de8e681a4510030aea1037f0c0dca17727205d (patch) | |
| tree | 44663d41ec301b23158b66679bfb20d611adb412 /xci/config | |
| parent | e566a209fa0ffa35b6d8e9f53eae1cb3074d0bc7 (diff) | |
| parent | 35352068809bf31c3eecec01a7fd9ba75b2c8c2c (diff) | |
Merge "Set VM node names and log the installer version based on installer"
Diffstat (limited to 'xci/config')
| -rwxr-xr-x | xci/config/ha-vars | 3 | ||||
| -rwxr-xr-x | xci/config/mini-vars | 3 | ||||
| -rwxr-xr-x | xci/config/noha-vars | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/xci/config/ha-vars b/xci/config/ha-vars index 32616ab3..131de2a7 100755 --- a/xci/config/ha-vars +++ b/xci/config/ha-vars @@ -10,7 +10,8 @@ # Configure VM Nodes #------------------------------------------------------------------------------- export TEST_VM_NUM_NODES=6 -export TEST_VM_NODE_NAMES="opnfv controller00 controller01 controller02 compute00 compute01" +[[ "$INSTALLER_TYPE" == "osa" ]] && export TEST_VM_NODE_NAMES="opnfv controller00 controller01 controller02 compute00 compute01" +[[ "$INSTALLER_TYPE" == "kubespray" ]] && export TEST_VM_NODE_NAMES="opnfv master1 master2 master3 node1 node2" export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm} export VM_CPU=${VM_CPU:-6} export VM_DISK=${VM_DISK:-80} diff --git a/xci/config/mini-vars b/xci/config/mini-vars index 142e8868..7d2b227b 100755 --- a/xci/config/mini-vars +++ b/xci/config/mini-vars @@ -10,7 +10,8 @@ # Configure VM Nodes #------------------------------------------------------------------------------- export TEST_VM_NUM_NODES=3 -export TEST_VM_NODE_NAMES="opnfv controller00 compute00" +[[ "$INSTALLER_TYPE" == "osa" ]] && export TEST_VM_NODE_NAMES="opnfv controller00 compute00" +[[ "$INSTALLER_TYPE" == "kubespray" ]] && export TEST_VM_NODE_NAMES="opnfv master1 node1" export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm} export VM_CPU=${VM_CPU:-6} export VM_DISK=${VM_DISK:-80} diff --git a/xci/config/noha-vars b/xci/config/noha-vars index 4610b32a..8d30a243 100755 --- a/xci/config/noha-vars +++ b/xci/config/noha-vars @@ -10,7 +10,8 @@ # Configure VM Nodes #------------------------------------------------------------------------------- export TEST_VM_NUM_NODES=4 -export TEST_VM_NODE_NAMES="opnfv controller00 compute00 compute01" +[[ "$INSTALLER_TYPE" == "osa" ]] && export TEST_VM_NODE_NAMES="opnfv controller00 compute00 compute01" +[[ "$INSTALLER_TYPE" == "kubespray" ]] && export TEST_VM_NODE_NAMES="opnfv master1 node1 node2" export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm} export VM_CPU=${VM_CPU:-6} export VM_DISK=${VM_DISK:-80} |