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>

diff --git a/xci/config/ha-vars b/xci/config/ha-vars
index 32616ab..131de2a 100755 (executable)
--- 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 142e886..7d2b227 100755 (executable)
--- 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 4610b32..8d30a24 100755 (executable)
--- 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}

diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index 053c12d..b11673c 100755 (executable)
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -87,12 +87,13 @@ trap submit_bug_report ERR
 echo "Info: Starting XCI Deployment"
 echo "Info: Deployment parameters"
 echo "-------------------------------------------------------------------------"
+echo "OPNFV scenario: $DEPLOY_SCENARIO"
 echo "xci flavor: $XCI_FLAVOR"
 echo "xci installer: $INSTALLER_TYPE"
 echo "opnfv/releng-xci version: $(git rev-parse HEAD)"
 echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION"
-echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION"
-echo "OPNFV scenario: $DEPLOY_SCENARIO"
+[[ "$INSTALLER_TYPE" == "osa" ]] && echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION"
+[[ "$INSTALLER_TYPE" == "kubespray" ]] && echo "kubespray version: $KUBESPRAY_VERSION"
 echo "-------------------------------------------------------------------------"
 
 #-------------------------------------------------------------------------------