can set ssh private key path file via env var

2 files changed, 51 insertions, 10 deletions

diff --git a/docker/Makefile b/docker/Makefile
index a2ee81a..57240e2 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,3 +1,4 @@
+NUM_INSTANCES ?= 10
 all: build
 testrun: build spinup dcat spindown
 serverfarm: spindown build spinup
@@ -9,26 +10,26 @@ build:
 	rm ./dserver
 	rm ./mapr_testdata.log
 spinup:
-	./spinup.sh 10
+	./spinup.sh ${NUM_INSTANCES}
 spindown:
-	./spindown.sh 10
+	./spindown.sh ${NUM_INSTANCES}
 spinup1:
 	docker run -p 2222:2222 dserver:develop
 dtail:
-	../dtail --user fred --key id_rsa_docker --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --logLevel DEBUG
+	../dtail --user paul --key id_rsa_docker --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --logLevel DEBUG
 dtail2:
-	../dtail --user fred --key id_rsa_docker --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --logLevel DEBUG --query 'from stats select max($$goroutines),count($$hostname),$$hostname,last($$time) group by $$hostname order by max($$goroutines)'
+	../dtail --user paul --key id_rsa_docker --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --logLevel DEBUG --query 'from stats select max($$goroutines),count($$hostname),$$hostname,last($$time) group by $$hostname order by max($$goroutines)'
 dgrep:
-	../dgrep --user fred --key id_rsa_docker --servers serverlist.txt --files '/var/log/dserver/*' --regex MAPREDUCE --trustAllHosts
+	../dgrep --user paul --key id_rsa_docker --servers serverlist.txt --files '/var/log/dserver/*' --regex MAPREDUCE --trustAllHosts
 dcat:
-	../dcat --user fred --key id_rsa_docker --servers serverlist.txt --files '/etc/passwd' --trustAllHosts
+	../dcat --user paul --key id_rsa_docker --servers serverlist.txt --files '/etc/passwd' --trustAllHosts
 dcat_notrust:
-	../dcat --user fred --key id_rsa_docker --servers serverlist.txt --files '/etc/passwd'
+	../dcat --user paul --key id_rsa_docker --servers serverlist.txt --files '/etc/passwd'
 dmap:
-	../dmap --user fred --key id_rsa_docker --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --query 'from stats select avg($$goroutines),max($$goroutines),min($$goroutines),last($$goroutines),count($$hostname),$$hostname group by $$hostname order by avg($$goroutines)'
+	../dmap --user paul --key id_rsa_docker --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --query 'from stats select avg($$goroutines),max($$goroutines),min($$goroutines),last($$goroutines),count($$hostname),$$hostname group by $$hostname order by avg($$goroutines)'
 test: dmap_test dmap2_test
 dmap_test:
-	../dmap --user fred --key id_rsa_docker --servers serverlist.txt --files '/var/log/mapr_testdata.log' --trustAllHosts --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-A.csv'
-	../dmap --user fred --key id_rsa_docker --servers serverlist.txt --files '/var/log/mapr_testdata.log' --trustAllHosts --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-B.csv'
+	../dmap --user paul --key id_rsa_docker --servers serverlist.txt --files '/var/log/mapr_testdata.log' --trustAllHosts --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-A.csv'
+	../dmap --user paul --key id_rsa_docker --servers serverlist.txt --files '/var/log/mapr_testdata.log' --trustAllHosts --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-B.csv'
 	@echo Expecting zero diff!
 	diff -u <(sort dmap2-A.csv) <(sort dmap2-B.csv)
diff --git a/docker/serverlist.txt b/docker/serverlist.txt
index 62a6ea6..8a5d389 100644
--- a/docker/serverlist.txt
+++ b/docker/serverlist.txt
@@ -8,3 +8,43 @@ localhost:2229
 localhost:2230
 localhost:2231
 localhost:2232
+localhost:2233
+localhost:2234
+localhost:2235
+localhost:2236
+localhost:2237
+localhost:2238
+localhost:2239
+localhost:2240
+localhost:2241
+localhost:2242
+localhost:2243
+localhost:2244
+localhost:2245
+localhost:2246
+localhost:2247
+localhost:2248
+localhost:2249
+localhost:2250
+localhost:2251
+localhost:2252
+localhost:2253
+localhost:2254
+localhost:2255
+localhost:2256
+localhost:2257
+localhost:2258
+localhost:2259
+localhost:2260
+localhost:2261
+localhost:2262
+localhost:2263
+localhost:2264
+localhost:2265
+localhost:2266
+localhost:2267
+localhost:2268
+localhost:2269
+localhost:2270
+localhost:2271
+localhost:2272