summaryrefslogtreecommitdiffstats
path: root/xci/xci-deploy.sh
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-03-12 23:22:55 +0100
committerFatih Degirmenci <fdegir@gmail.com>2018-03-12 23:28:19 +0100
commit35352068809bf31c3eecec01a7fd9ba75b2c8c2c (patch)
tree8d345b0a1a4ae3ffaa9e35a7d2e2e793842498c2 /xci/xci-deploy.sh
parentc6ea45f88ce8c11e7b0e35b6d1c8cf233ebd556c (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/xci-deploy.sh')
-rwxr-xr-xxci/xci-deploy.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index 053c12d1..b11673c1 100755
--- 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 "-------------------------------------------------------------------------"
#-------------------------------------------------------------------------------