X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=Makefile;h=fb690465f08d6cde607cd4e6717226fafc7a8715;hp=d166862be323de9b4c66ea1c6a8c2c59454932d5;hb=refs%2Fheads%2Frelease%2F2019.99.1;hpb=d0776b4eb676ae408efd69087c0692836fa6db24 diff --git a/Makefile b/Makefile index d166862..fb69046 100644 --- 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?=""