Code Review
/
salt-formulas
/
elasticsearch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Raise ES disk space alert thresholds
[salt-formulas/elasticsearch.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index d166862be323de9b4c66ea1c6a8c2c59454932d5..fb690465f08d6cde607cd4e6717226fafc7a8715 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-18,7
+18,11
@@
else
JOBS := 1
endif
+ifeq (,$(wildcard ./.kitchen.openstack.yml))
+KITCHEN_LOCAL_YAML?=.kitchen.openstack.yml
+else
KITCHEN_LOCAL_YAML?=.kitchen.yml
+endif
KITCHEN_OPTS?="--concurrency=$(JOBS)"
KITCHEN_OPTS_CREATE?=""
KITCHEN_OPTS_CONVERGE?=""