diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-03-12 23:22:55 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-03-12 23:28:19 +0100 |
| commit | 35352068809bf31c3eecec01a7fd9ba75b2c8c2c (patch) | |
| tree | 8d345b0a1a4ae3ffaa9e35a7d2e2e793842498c2 /xci/config/ha-vars | |
| parent | c6ea45f88ce8c11e7b0e35b6d1c8cf233ebd556c (diff) | |
Set VM node names and log the installer version based on installer
The VM nodes are named using OpenStack terminology but since we
now have Kubernetes scenario, it is appropriate to name the nodes
accordingly.
Apart from that, we normally log the version of OSA which is not
correct for kubernetes deployments. Logging Kubespray version would
be correct for this scenario.
Change-Id: I3964574c8592450f9fa3126f19e27bb78fd9d174
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'xci/config/ha-vars')
| -rwxr-xr-x | xci/config/ha-vars | 3 |
1 files changed, 2 insertions, 1 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} |