summaryrefslogtreecommitdiffstats
path: root/xci
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-08-21 14:55:28 +0200
committerFatih Degirmenci <fdegir@gmail.com>2018-08-22 08:45:49 +0200
commite1b1f28d3ad3224e518faa50a04e04bde51c4829 (patch)
tree796016b3fe61625b19a9c1fffd9febdde8af2bd7 /xci
parent973920421d98159a3d91790859061ee718cd1e07 (diff)
Print OpenStack login information at the end
The info is logged to the console before post-deployment tasks and this makes it seeing the deployment status and login info inconvenient. This change moves the logging to the end, after post-deployment. Change-Id: Ic7e232a0b8343e666f54087fbcc09481ab59ca90 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'xci')
-rwxr-xr-xxci/installer/osa/deploy.sh31
1 files changed, 16 insertions, 15 deletions
diff --git a/xci/installer/osa/deploy.sh b/xci/installer/osa/deploy.sh
index fd794d01..8b3a67d0 100755
--- a/xci/installer/osa/deploy.sh
+++ b/xci/installer/osa/deploy.sh
@@ -160,6 +160,22 @@ echo
echo "Info: OpenStack installation is successfully completed!"
#-------------------------------------------------------------------------------
+# Execute post-installation tasks
+#-------------------------------------------------------------------------------
+# Playbook post.yml is used in order to execute any post-deployment tasks that
+# are required for the scenario under test.
+#-------------------------------------------------------------------------------
+echo "-----------------------------------------------------------------------"
+echo "Info: Running post-deployment scenario role"
+echo "-----------------------------------------------------------------------"
+cd $OSA_XCI_PLAYBOOKS
+ansible-playbook ${XCI_ANSIBLE_PARAMS} -i ${XCI_PLAYBOOKS}/dynamic_inventory.py \
+ post-deployment.yml
+echo "-----------------------------------------------------------------------"
+echo
+echo "Info: Post-deployment scenario role execution done"
+
+#-------------------------------------------------------------------------------
# - Getting OpenStack login information
#-------------------------------------------------------------------------------
echo "Info: Openstack login details"
@@ -180,19 +196,4 @@ echo "Info: Admin username - ${USERNAME##*=}"
echo "Info: Admin password - ${PASSWORD##*=}"
echo "Info: It is recommended to change the default password."
-#-------------------------------------------------------------------------------
-# Execute post-installation tasks
-#-------------------------------------------------------------------------------
-# Playbook post.yml is used in order to execute any post-deployment tasks that
-# are required for the scenario under test.
-#-------------------------------------------------------------------------------
-echo "-----------------------------------------------------------------------"
-echo "Info: Running post-deployment scenario role"
-echo "-----------------------------------------------------------------------"
-cd $OSA_XCI_PLAYBOOKS
-ansible-playbook ${XCI_ANSIBLE_PARAMS} -i ${XCI_PLAYBOOKS}/dynamic_inventory.py \
- post-deployment.yml
-echo "-----------------------------------------------------------------------"
-echo
-echo "Info: Post-deployment scenario role execution done"
# vim: set ts=4 sw=4 expandtab: