diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-03-19 08:41:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-19 08:41:37 +0000 |
| commit | d0c16a80bac11f52bba7cc6e7152ec47aababe1f (patch) | |
| tree | aa3fea0590446ab07cbf24404d185485d3510e7d | |
| parent | 1294c5e67ec9d344caee473c6f87b1a0b39fb451 (diff) | |
| parent | dc64b4278c4245713e9e38742108d4d5ea77e035 (diff) | |
Merge "kubespray: Do not grep log text to determine failure"
| -rwxr-xr-x | xci/installer/kubespray/deploy.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/xci/installer/kubespray/deploy.sh b/xci/installer/kubespray/deploy.sh index 548ed771..b68fec90 100755 --- a/xci/installer/kubespray/deploy.sh +++ b/xci/installer/kubespray/deploy.sh @@ -7,11 +7,13 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +set -o errexit +set -o nounset +set -o pipefail K8_XCI_PLAYBOOKS="$(dirname $(realpath ${BASH_SOURCE[0]}))/playbooks" export ANSIBLE_ROLES_PATH=$HOME/.ansible/roles:/etc/ansible/roles:${XCI_PATH}/xci/playbooks/roles - #------------------------------------------------------------------------------- # Configure localhost #------------------------------------------------------------------------------- @@ -72,14 +74,9 @@ fi echo "Info: Using kubespray to deploy the kubernetes cluster" echo "-----------------------------------------------------------------------" -ssh root@$OPNFV_HOST_IP "cd releng-xci/.cache/repos/kubespray;\ +ssh root@$OPNFV_HOST_IP "set -o pipefail; cd releng-xci/.cache/repos/kubespray;\ ansible-playbook ${XCI_ANSIBLE_PARAMS} \ -i opnfv_inventory/inventory.cfg cluster.yml -b | tee setup-kubernetes.log" scp root@$OPNFV_HOST_IP:~/releng-xci/.cache/repos/kubespray/setup-kubernetes.log \ $LOG_PATH/setup-kubernetes.log -# check the log to see if we have any error -if grep -q 'failed=1\|unreachable=1' $LOG_PATH/setup-kubernetes.log; then - echo "Error: Kubernetes cluster setup failed!" - exit 1 -fi echo "Info: Kubernetes installation is successfully completed!" |