From: root <zhou.ya@zte.com.cn>
Date: Mon, 24 Jul 2017 07:20:29 +0000 (+0800)
Subject: when deploy have failed print the api log
X-Git-Tag: opnfv-5.0.RC1~59
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F37985%2F1;p=daisy.git

when deploy have failed print the api log

Change-Id: I6047340f7f0d2c7b6b175335bdbf836a2a8d0a9c
Signed-off-by: root <zhou.ya@zte.com.cn>
---

diff --git a/deploy/check_openstack_progress.sh b/deploy/check_openstack_progress.sh
index 15dbcdda..7fa16524 100755
--- a/deploy/check_openstack_progress.sh
+++ b/deploy/check_openstack_progress.sh
@@ -52,6 +52,10 @@ while true; do
         break
     elif [ $openstack_install_failed -gt 0 ]; then
         echo "openstack installing have failed..."
+        echo "this is the daisy api log"
+        cat /var/log/daisy/api.log |grep -v wsgi
+        echo "----------------------------------------------------"
+        echo "this is the kolla install log"
         tail -n 200 /var/log/daisy/kolla_$cluster_id*
         exit 1
     else
diff --git a/deploy/check_os_progress.sh b/deploy/check_os_progress.sh
index e742467c..fe452503 100755
--- a/deploy/check_os_progress.sh
+++ b/deploy/check_os_progress.sh
@@ -62,6 +62,8 @@ while true; do
         break
     elif [ $os_install_failed -gt 0 ]; then
         echo "os installing have failed..."
+        echo "this is the daisy api log"
+        cat /var/log/daisy/api.log |grep -v wsgi
         exit 1
     else
         progress=`daisy host-list --cluster-id $cluster_id |grep DISCOVERY_SUCCESSFUL |awk -F "|" '{print $7}'|sed s/[[:space:]]//g|sed ':a;N;$ s/\n/ /g;ba'`