Allow customising cluster keys
Define the CLUSTER_KEYS setup variable to specify the cluster key pair.
This allows more isolation between different users accessing different
clusters with separate key pairs.
Change-Id: I74c8d1e8a29c2c398378500eb50fa05c2ef3fd8e
diff --git a/master-slave/Makefile b/master-slave/Makefile
index ee5ec6f..11a90e8 100644
--- a/master-slave/Makefile
+++ b/master-slave/Makefile
@@ -24,7 +24,8 @@
--template-body file://`pwd`/$(CLUSTER_TEMPLATE) \
--region $(AWS_REGION) \
--parameters \
- ParameterKey=DesiredCapacity,ParameterValue=$(CLUSTER_DESIRED_CAPACITY)
+ ParameterKey=DesiredCapacity,ParameterValue=$(CLUSTER_DESIRED_CAPACITY) \
+ ParameterKey=ECSKeyName,ParameterValue=$(CLUSTER_KEYS)
service-master:
$(AWS_FC_COMMAND) create-stack \
diff --git a/master-slave/setup.env.template b/master-slave/setup.env.template
index eb20cf5..2d29f51 100644
--- a/master-slave/setup.env.template
+++ b/master-slave/setup.env.template
@@ -1,4 +1,5 @@
CLUSTER_STACK_NAME:=gerrit-cluster
+CLUSTER_KEYS:=gerrit-cluster-keys
CLUSTER_DESIRED_CAPACITY:=1
SERVICE_MASTER_STACK_NAME:=gerrit-service-master
SERVICE_SLAVE_STACK_NAME:=gerrit-service-slave
diff --git a/single-master/Makefile b/single-master/Makefile
index 4db2552..90e8779 100644
--- a/single-master/Makefile
+++ b/single-master/Makefile
@@ -20,7 +20,9 @@
--stack-name $(CLUSTER_STACK_NAME) \
--capabilities CAPABILITY_IAM \
--template-body file://`pwd`/$(CLUSTER_TEMPLATE) \
- --region $(AWS_REGION)
+ --region $(AWS_REGION) \
+ --parameters \
+ ParameterKey=ECSKeyName,ParameterValue=$(CLUSTER_KEYS)
service:
$(AWS_FC_COMMAND) create-stack \
diff --git a/single-master/setup.env.template b/single-master/setup.env.template
index 63a6891..25b1134 100644
--- a/single-master/setup.env.template
+++ b/single-master/setup.env.template
@@ -1,5 +1,6 @@
CLUSTER_STACK_NAME:=gerrit-cluster
SERVICE_STACK_NAME:=gerrit-service
+CLUSTER_KEYS:=gerrit-cluster-keys
DNS_ROUTING_STACK_NAME:=gerrit-dns-routing
HOSTED_ZONE_NAME:=mycompany.com
SUBDOMAIN:=gerrit-master-demo
