Fix import inheritance between common.env and setup.env
Before this fix, creating or deleting the stack would have failed unless
the AWS_PREFIX variable was specified at runtime, as such:
make AWS_PREFIX=foobar create-all
This is because setup.env depends on some values defined in common.env
and thus the latter needs to be imported first to guarantee the correct
expansion of the variables.
Change-Id: Ic89a642965e14a83db9f938f50ae8bc1ccab1687
diff --git a/dual-master/Makefile b/dual-master/Makefile
index fc4686f..eda7031 100644
--- a/dual-master/Makefile
+++ b/dual-master/Makefile
@@ -1,5 +1,5 @@
+include ../common.env # Must be included before setup.env because the latter depends on it
include setup.env
-include ../common.env
include ../Makefile.common
CLUSTER_TEMPLATE:=cf-cluster.yml
diff --git a/master-slave/Makefile b/master-slave/Makefile
index 7585714..2413277 100644
--- a/master-slave/Makefile
+++ b/master-slave/Makefile
@@ -1,5 +1,5 @@
+include ../common.env # Must be included before setup.env because the latter depends on it
include setup.env
-include ../common.env
include ../Makefile.common
CLUSTER_TEMPLATE:=cf-cluster.yml
diff --git a/monitoring/Makefile b/monitoring/Makefile
index f703011..5e1cc89 100644
--- a/monitoring/Makefile
+++ b/monitoring/Makefile
@@ -1,3 +1,4 @@
+include ../common.env # Must be included before setup.env because the latter depends on it
include ../$(RECIPE)/setup.env
AWS_FC_COMMAND=export AWS_PAGER=;aws cloudformation
diff --git a/single-master/Makefile b/single-master/Makefile
index abe9b9d..c4519a1 100644
--- a/single-master/Makefile
+++ b/single-master/Makefile
@@ -1,5 +1,5 @@
+include ../common.env # Must be included before setup.env because the latter depends on it
include setup.env
-include ../common.env
include ../Makefile.common
CLUSTER_TEMPLATE:=cf-cluster.yml
