diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-03-12 21:10:48 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-03-13 10:15:28 +0100 |
| commit | 3f97890ec1cbedfa59bd77d11b1f1436e282659b (patch) | |
| tree | 8a71c0fa60d4cfa3a8aaaf6c67da60405732c52d | |
| parent | c6ea45f88ce8c11e7b0e35b6d1c8cf233ebd556c (diff) | |
Do not grep log text to determine failure
Pipefail should be sufficient to determine the failure so this
change gets rid of grepping the logs for failure and unreachable
to leave the evaluation to bash itself.
Change-Id: Ie928438c1503b086159276af4308f5549b58cb71
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
| -rwxr-xr-x | xci/installer/osa/deploy.sh | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/xci/installer/osa/deploy.sh b/xci/installer/osa/deploy.sh index 1e442918..255d4c67 100755 --- a/xci/installer/osa/deploy.sh +++ b/xci/installer/osa/deploy.sh @@ -127,11 +127,6 @@ ssh root@$OPNFV_HOST_IP "set -o pipefail; openstack-ansible ${XCI_ANSIBLE_VERBOS releng-xci/.cache/repos/openstack-ansible/playbooks/setup-infrastructure.yml | tee setup-infrastructure.log" scp root@$OPNFV_HOST_IP:~/setup-infrastructure.log $LOG_PATH/setup-infrastructure.log echo "-----------------------------------------------------------------------" -# check the log to see if we have any error -if grep -q 'failed=1\|unreachable=1' $LOG_PATH/setup-infrastructure.log; then - echo "Error: OpenStack node setup failed!" - exit 1 -fi #------------------------------------------------------------------------------- # Verify database cluster @@ -161,11 +156,7 @@ ssh root@$OPNFV_HOST_IP "set -o pipefail; openstack-ansible ${XCI_ANSIBLE_VERBOS releng-xci/.cache/repos/openstack-ansible/playbooks/setup-openstack.yml | tee opnfv-setup-openstack.log" scp root@$OPNFV_HOST_IP:~/opnfv-setup-openstack.log $LOG_PATH/opnfv-setup-openstack.log echo "-----------------------------------------------------------------------" -# check the log to see if we have any error -if grep -q 'failed=1\|unreachable=1' $LOG_PATH/opnfv-setup-openstack.log; then - echo "Error: OpenStack installation failed!" - exit 1 -fi +echo echo "Info: OpenStack installation is successfully completed!" #------------------------------------------------------------------------------- |