Merge "[FAB-3161] Enhance cluster-creation reporting"

hyperledger · May 5, 2017 · 8c4fa8e · 8c4fa8e
2 parents add0af3 + 6663dc0
commit 8c4fa8e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/examples/cluster/Makefile b/examples/cluster/Makefile
@@ -41,8 +41,10 @@ help:
 	@cat usage.txt
 
 compose-up: nodes
+	@echo "Booting docker-compose environment"
 	$(COMPOSE) up -d ca $(PEERS)
 	$(DRUN) ./configure.sh $(CHANNEL_NAME) "$(CHANNEL_TXNS)" "$(PEERS)" $(TLS)
+	@./compose/report-env.sh "$(filter-out cli,$(NODES)")
 
 compose-down:
 	$(COMPOSE) down

diff --git a/examples/cluster/compose/report-env.sh b/examples/cluster/compose/report-env.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+NODES=$1
+
+getip() {
+    HOST=$1
+
+    docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $HOST
+}
+
+generate_hosts() {
+    for NODE in $NODES; do
+        echo "$(getip $NODE) $NODE"
+    done
+}
+
+echo "========================================================================"
+echo "Cluster ready!"
+echo "========================================================================"
+echo
+generate_hosts | sort