From 35352068809bf31c3eecec01a7fd9ba75b2c8c2c Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Mon, 12 Mar 2018 23:22:55 +0100 Subject: 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 --- xci/config/mini-vars | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xci/config/mini-vars') 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} -- cgit 1.2.3-korg