From f615fa0f50ab849526434cfe24a25246696df339 Mon Sep 17 00:00:00 2001 From: Bryan Sullivan Date: Mon, 27 Nov 2017 16:47:14 -0800 Subject: Run actions in parallel to reduce overall deploy time. JIRA: VES-2 Change-Id: I557429ceb44f221057748d75d37d7f0fa58d8b41 Signed-off-by: Bryan Sullivan --- tools/demo_deploy.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/demo_deploy.sh b/tools/demo_deploy.sh index 973b381..d8f6be0 100644 --- a/tools/demo_deploy.sh +++ b/tools/demo_deploy.sh @@ -92,9 +92,6 @@ ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \ bash /tmp/ves/tools/ves-setup.sh collector bash /tmp/ves/tools/ves-setup.sh kafka bash /tmp/ves/tools/ves-setup.sh agent $cloudify - ves_collectd=$ves_collectd - export ves_collectd - bash /tmp/ves/tools/ves-setup.sh collectd EOF scp -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \ @@ -102,17 +99,20 @@ scp -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \ echo; echo "$0 $(date): VES Grafana dashboards are available at http://$master:3001 (login as admin/admin)" -for node in $workers; do +nodes="$master $workers" +for node in $nodes; do echo; echo "$0 $(date): Setting up collectd at $node" - scp -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \ - ~/ves ubuntu@$node:/tmp + if [[ "$node" != "$master" ]]; then + scp -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \ + ~/ves ubuntu@$node:/tmp + fi ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \ - ubuntu@$node < /dev/null 2>&1 & ves_kafka_host=$master export ves_kafka_host ves_kafka_hostname=$ves_kafka_hostname export ves_kafka_hostname - ves_collectd=$ves_collectd + ves_collectd=build export ves_collectd bash /tmp/ves/tools/ves-setup.sh collectd EOF -- cgit 1.2.3-korg