From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Fri, 13 Oct 2017 17:21:26 +0000 (+0200)
Subject: ci/deploy.sh: Add installation succesful message
X-Git-Tag: opnfv-5.0.RC1~23
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F45041%2F1;p=fuel.git

ci/deploy.sh: Add installation succesful message

Change-Id: Id366854c4ccb3b835f4a54ddea924a3a2cc30c7d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 3479e81a8bfa1ae15084100f2b3872ca8f1ed752)
---

diff --git a/ci/deploy.sh b/ci/deploy.sh
index f6c3591d2..9b28d4bf9 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -218,12 +218,12 @@ do
 done
 
 if [[ "$(sudo whoami)" != 'root' ]]; then
-    notify "This script requires sudo rights\n" 1>&2
+    notify "[ERROR] This script requires sudo rights\n" 1>&2
     exit 1
 fi
 
 if ! virsh list >/dev/null 2>&1; then
-    notify "This script requires hypervisor access\n" 1>&2
+    notify "[ERROR] This script requires hypervisor access\n" 1>&2
     exit 1
 fi
 
@@ -357,10 +357,10 @@ notify "[NOTE] Using bridges: ${OPNFV_BRIDGES[*]}\n" 2
 
 # Infra setup
 if [ ${DRY_RUN} -eq 1 ]; then
-    notify "Dry run, skipping all deployment tasks\n" 2 1>&2
+    notify "[NOTE] Dry run, skipping all deployment tasks\n" 2 1>&2
     exit 0
 elif [ ${USE_EXISTING_INFRA} -eq 1 ]; then
-    notify "Use existing infra\n" 2 1>&2
+    notify "[NOTE] Use existing infra\n" 2 1>&2
     check_connection
 else
     generate_ssh_key
@@ -375,11 +375,12 @@ else
 fi
 
 # Openstack cluster setup
+set +x
 if [ ${INFRA_CREATION_ONLY} -eq 1 ] || [ ${NO_DEPLOY_ENVIRONMENT} -eq 1 ]; then
-    notify "Skip openstack cluster setup\n" 2
+    notify "[NOTE] Skip openstack cluster setup\n" 2
 else
     for state in "${cluster_states[@]}"; do
-        notify "STATE: ${state}\n" 2
+        notify "[STATE] Applying state: ${state}\n" 2
         # shellcheck disable=SC2086,2029
         ssh ${SSH_OPTS} "${SSH_SALT}" \
             sudo "/root/fuel/mcp/config/states/${state} || true"
@@ -390,6 +391,8 @@ fi
 
 popd > /dev/null
 
+notify "\n[DONE] MCP: Openstack installation finished succesfully!\n\n" 2
+
 #
 # END of main
 ##############################################################################