diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-14 19:07:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-14 19:07:02 +0000 |
| commit | 890763baf32de0bab7985b55fe9f8d7c59c48dc0 (patch) | |
| tree | 2f96b281d47dbb083f1dad73d677557c63b50fab | |
| parent | 6454eccb0a2dfd31baf454ab5fcc2dc3a2b8155d (diff) | |
| parent | bdd9a222aed2ca15a47a945b5fe03e2e11584df0 (diff) | |
Merge "xci: xci-deploy.sh: Do not 'tee' ssh output"
| -rwxr-xr-x | xci/xci-deploy.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 20d0247e..60151220 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -159,8 +159,8 @@ fi echo "Info: Setting up target hosts for openstack-ansible" echo "-----------------------------------------------------------------------" ssh root@$OPNFV_HOST_IP "openstack-ansible \ - $OPENSTACK_OSA_PATH/playbooks/setup-hosts.yml" | \ - tee $LOG_PATH/setup-hosts.log + $OPENSTACK_OSA_PATH/playbooks/setup-hosts.yml | tee setup-hosts.log " +scp root@$OPNFV_HOST_IP:~/setup-hosts.log $LOG_PATH/setup-hosts.log echo "-----------------------------------------------------------------------" echo "Info: Set up target hosts for openstack-ansible successfuly" @@ -192,8 +192,8 @@ echo "Info: Setting up infrastructure" echo "-----------------------------------------------------------------------" echo "xci: running ansible playbook setup-infrastructure.yml" ssh root@$OPNFV_HOST_IP "openstack-ansible \ - $OPENSTACK_OSA_PATH/playbooks//setup-infrastructure.yml" | \ - tee $LOG_PATH/setup-infrastructure.log + $OPENSTACK_OSA_PATH/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 @@ -206,10 +206,10 @@ fi #------------------------------------------------------------------------------- echo "Info: Verifying database cluster" echo "-----------------------------------------------------------------------" -ssh root@$OPNFV_HOST_IP "ansible -i $OPENSTACK_OSA_PATH/playbooks/inventory/ \ - galera_container -m shell \ - -a "mysql -h localhost -e 'show status like \"%wsrep_cluster_%\";'"" \ - | tee $LOG_PATH/galera.log +ssh root@$OPNFV_HOST_IP "ansible -vvv -i $OPENSTACK_OSA_PATH/playbooks/inventory/ \ + galera_container -m shell \ + -a \"mysql -h localhost -e \\\"show status like '%wsrep_cluster_%';\\\"\" | tee galera.log" +scp root@$OPNFV_HOST_IP:~/galera.log $LOG_PATH/galera.log echo "-----------------------------------------------------------------------" # check the log to see if we have any error if grep -q 'FAILED' $LOG_PATH/galera.log; then @@ -226,8 +226,8 @@ echo "Info: Database cluster verification successful!" echo "Info: Installing OpenStack on target hosts" echo "-----------------------------------------------------------------------" ssh root@$OPNFV_HOST_IP "openstack-ansible \ - $OPENSTACK_OSA_PATH/playbooks/setup-openstack.yml" | \ - tee $LOG_PATH/opnfv-setup-openstack.log + $OPENSTACK_OSA_PATH/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 |