hack/terraform-quickstart: support bringing up extra masters

Author: Patrick Baxter

hack/terraform-quickstart/main.tf

@@ -25,6 +25,17 @@ resource "aws_instance" "worker_node" {
   }
 }
 
+resource "aws_instance" "master_node" {
+  ami           = "${data.aws_ami.coreos_ami.image_id}"
+  instance_type = "m3.medium"
+  key_name      = "${var.ssh_key}"
+  count         = "${var.additional_masters}"
+
+  tags {
+    Name = "${var.instance_tags}"
+  }
+}
+
 data "aws_ami" "coreos_ami" {
   most_recent = true
 

hack/terraform-quickstart/outputs.tf

@@ -6,6 +6,10 @@ output "worker_ips" {
   value = ["${aws_instance.worker_node.*.public_ip}"]
 }
 
+output "master_ips" {
+  value = ["${aws_instance.master_node.*.public_ip}"]
+}
+
 output "self_host_etcd" {
   value = "${var.self_host_etcd}"
 }

hack/terraform-quickstart/start-cluster.sh

@@ -3,6 +3,7 @@ set -euo pipefail
 
 export BOOTSTRAP_IP=`terraform output bootstrap_node_ip`
 export WORKER_IPS=`terraform output -json worker_ips | jq -r '.value[]'`
+export MASTER_IPS=`terraform output -json master_ips | jq -r '.value[]'`
 export SELF_HOST_ETCD=`terraform output self_host_etcd`
 export SSH_OPTS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
@@ -11,5 +12,10 @@ cd ../quickstart
 
 for IP in $WORKER_IPS
 do
-  ./init-worker.sh $IP cluster/auth/kubeconfig
+  ./init-node.sh $IP cluster/auth/kubeconfig
+done
+
+for IP in $MASTER_IPS
+do
+  TAG_MASTER=true ./init-node.sh $IP cluster/auth/kubeconfig
 done

hack/terraform-quickstart/variables.tf

@@ -27,6 +27,12 @@ variable "num_workers" {
   default     = "1"
 }
 
+variable "additional_masters" {
+  description = "number of additional master nodes not including bootstrap node"
+  type        = "string"
+  default     = "0"
+}
+
 variable "region" {
   description = "aws region"
   type        = "string"