Fix #675 - Move to etcd production cluster setup where slaves/bastion…

… are etcd proxy nodes and master has the etcd control plane

terraform/aws/private-cloud/bastion-cloud-config.yml.tpl

@@ -2,21 +2,19 @@
 
 coreos:
   etcd2:
-    # $private_ipv4 is populated by the cloud provider
-    # we don't have a $public_ipv4 in the private VPC
-    advertise-client-urls: http://$private_ipv4:2379,http://$private_ipv4:4001
-    initial-advertise-peer-urls: http://$private_ipv4:2380
-    # listen on both the official ports and the legacy ports
-    # legacy ports can be omitted if your application doesn't depend on them
+    proxy: on
     listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
-    listen-peer-urls: http://$private_ipv4:2380,http://$private_ipv4:7001
-    # Discovery is populated by Terraform
     discovery: ${etcd_discovery_url}
+  fleet:
+    metadata: "role=bastion,region=${region}"
+    etcd_servers: "http://localhost:2379"
+  locksmith:
+    endpoint: "http://localhost:2379"
   units:
     - name: docker.service
       command: start
     - name: etcd2.service
       command: start
   update:
-    reboot-strategy: "reboot"
+    reboot-strategy: best-effort
 manage_etc_hosts: localhost

terraform/aws/private-cloud/bastion-server.tf

@@ -16,8 +16,9 @@ resource "template_file" "bastion_cloud_init" {
   depends_on = ["template_file.etcd_discovery_url"]
   vars {
     etcd_discovery_url = "${file(var.etcd_discovery_url_file)}"
-    size               = "${var.masters + var.slaves + 1}"
+    size               = "${var.masters}"
     vpc_cidr_block     = "${var.vpc_cidr_block}"
+    region             = "${var.region}"
   }
 }
 

terraform/aws/private-cloud/main.tf

@@ -60,11 +60,11 @@ module "elb" {
 resource "template_file" "etcd_discovery_url" {
   template = "/dev/null"
   provisioner "local-exec" {
-    command = "curl https://discovery.etcd.io/new?size=${var.masters + var.slaves} > ${var.etcd_discovery_url_file}"
+    command = "curl https://discovery.etcd.io/new?size=${var.masters} > ${var.etcd_discovery_url_file}"
   }
   # This will regenerate the discovery URL if the cluster size changes, we include the bastion here
   vars {
-    size = "${var.masters + var.slaves + 1}"
+    size = "${var.masters}"
   }
 }
 

terraform/aws/private-cloud/master-cloud-config.yml.tpl

@@ -12,9 +12,11 @@ coreos:
     listen-peer-urls: http://$private_ipv4:2380,http://$private_ipv4:7001
     # Discovery is populated by Terraform
     discovery: ${etcd_discovery_url}
+  fleet:
+    metadata: "role=master,region=${region}"
   units:
     - name: etcd2.service
       command: start
   update:
-    reboot-strategy: "reboot"
+    reboot-strategy: best-effort
 manage_etc_hosts: localhost

terraform/aws/private-cloud/mesos-masters.tf

@@ -15,7 +15,8 @@ resource "template_file" "master_cloud_init" {
   depends_on = ["template_file.etcd_discovery_url"]
   vars {
     etcd_discovery_url = "${file(var.etcd_discovery_url_file)}"
-    size               = "${var.masters + var.slaves + 1}"
+    size               = "${var.masters}"
+    region             = "${var.region}"
   }
 }
 

terraform/aws/private-cloud/mesos-slaves.tf

@@ -15,7 +15,8 @@ resource "template_file" "slave_cloud_init" {
   depends_on = ["template_file.etcd_discovery_url"]
   vars {
     etcd_discovery_url = "${file(var.etcd_discovery_url_file)}"
-    size               = "${var.masters + var.slaves + 1}"
+    size               = "${var.masters}"
+    region             = "${var.region}"
   }
 }
 

terraform/aws/private-cloud/slave-cloud-config.yml.tpl

@@ -31,20 +31,18 @@ coreos:
             After=var-lib-docker.mount
             Requires=var-lib-docker.mount
   etcd2:
-    # $public_ipv4 and $private_ipv4 are populated by the cloud provider
-    advertise-client-urls: http://$public_ipv4:2379
-    initial-advertise-peer-urls: http://$private_ipv4:2380
+    proxy: on
     listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
-    listen-peer-urls: http://$private_ipv4:2380,http://$private_ipv4:7001
-    # Discovery is populated by Terraform
     discovery: ${etcd_discovery_url}
   fleet:
+    metadata: "role=slave,region=${region}"
     public-ip: "$public_ipv4"
+    etcd_servers: "http://localhost:2379"
+  locksmith:
+    endpoint: "http://localhost:2379"
   units:
     - name: etcd2.service
       command: start
-    - name: fleet.service
-      command: start
   update:
     reboot-strategy: best-effort
 manage_etc_hosts: localhost

terraform/aws/public-cloud/etcd_discovery_url.txt

@@ -1 +1 @@
-https://discovery.etcd.io/fafb16ac572cae5895c6523e7b3bd640
+https://discovery.etcd.io/b71ce210f55ced2fcbad6d6c455098b5

terraform/aws/public-cloud/main.tf

@@ -72,11 +72,11 @@ module "elb" {
 resource "template_file" "etcd_discovery_url" {
   template = "/dev/null"
   provisioner "local-exec" {
-    command = "curl https://discovery.etcd.io/new?size=${var.masters + var.slaves} > ${var.etcd_discovery_url_file}"
+    command = "curl https://discovery.etcd.io/new?size=${var.masters} > ${var.etcd_discovery_url_file}"
   }
   # This will regenerate the discovery URL if the cluster size changes
   vars {
-    size = "${var.masters + var.slaves}"
+    size = "${var.masters}"
   }
 }
 

terraform/aws/public-cloud/master-cloud-config.yml.tpl

@@ -7,9 +7,9 @@ coreos:
     initial-advertise-peer-urls: http://$private_ipv4:2380
     listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
     listen-peer-urls: http://$private_ipv4:2380,http://$private_ipv4:7001
-    # Discovery is populated by Terraform
     discovery: ${etcd_discovery_url}
   fleet:
+    metadata: "role=master,region=${region}"
     public-ip: "$public_ipv4"
   units:
     - name: etcd2.service

terraform/aws/public-cloud/mesos-masters.tf

@@ -15,7 +15,8 @@ resource "template_file" "master_cloud_init" {
   depends_on = ["template_file.etcd_discovery_url"]
   vars {
     etcd_discovery_url = "${file(var.etcd_discovery_url_file)}"
-    size               = "${var.masters + var.slaves}"
+    size               = "${var.masters}"
+    region             = "${var.region}"
   }
 }
 

terraform/aws/public-cloud/mesos-slaves.tf

@@ -15,7 +15,8 @@ resource "template_file" "slave_cloud_init" {
   depends_on = ["template_file.etcd_discovery_url"]
   vars {
     etcd_discovery_url = "${file(var.etcd_discovery_url_file)}"
-    size               = "${var.masters + var.slaves}"
+    size               = "${var.masters}"
+    region             = "${var.region}"
   }
 }
 

terraform/aws/public-cloud/slave-cloud-config.yml.tpl

@@ -31,15 +31,15 @@ coreos:
             After=var-lib-docker.mount
             Requires=var-lib-docker.mount
   etcd2:
-    # $public_ipv4 and $private_ipv4 are populated by the cloud provider
-    advertise-client-urls: http://$public_ipv4:2379
-    initial-advertise-peer-urls: http://$private_ipv4:2380
+    proxy: on
     listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
-    listen-peer-urls: http://$private_ipv4:2380,http://$private_ipv4:7001
-    # Discovery is populated by Terraform
     discovery: ${etcd_discovery_url}
   fleet:
+    metadata: "role=slave,region=${region}"
     public-ip: "$public_ipv4"
+    etcd_servers: "http://localhost:2379"
+  locksmith:
+    endpoint: "http://localhost:2379"
   units:
     - name: etcd2.service
       command: start

terraform/digitalocean/main.tf

@@ -24,11 +24,11 @@ module "do-keypair" {
 resource "template_file" "etcd_discovery_url" {
   template = "/dev/null"
   provisioner "local-exec" {
-    command = "curl https://discovery.etcd.io/new?size=${var.masters + var.slaves} > ${var.etcd_discovery_url_file}"
+    command = "curl https://discovery.etcd.io/new?size=${var.masters} > ${var.etcd_discovery_url_file}"
   }
   # This will regenerate the discovery URL if the cluster size changes
   vars {
-    size = "${var.masters + var.slaves}"
+    size = "${var.masters}"
   }
 }
 
@@ -37,7 +37,8 @@ resource "template_file" "master_cloud_init" {
   depends_on = ["template_file.etcd_discovery_url"]
   vars {
     etcd_discovery_url = "${file(var.etcd_discovery_url_file)}"
-    size               = "${var.masters + var.slaves}"
+    size               = "${var.masters}"
+    region             = "${var.region}"
   }
 }
 
@@ -46,7 +47,8 @@ resource "template_file" "slave_cloud_init" {
   depends_on = ["template_file.etcd_discovery_url"]
   vars {
     etcd_discovery_url = "${file(var.etcd_discovery_url_file)}"
-    size               = "${var.masters + var.slaves}"
+    size               = "${var.masters}"
+    region             = "${var.region}"
   }
 }
 

terraform/digitalocean/master-cloud-config.yml.tpl

@@ -2,16 +2,13 @@
 
 coreos:
   etcd2:
-    # $private_ipv4 is populated by the cloud provider
-    # we don't have a $public_ipv4 in the private VPC
     advertise-client-urls: http://$private_ipv4:2379,http://$private_ipv4:4001
     initial-advertise-peer-urls: http://$private_ipv4:2380
-    # listen on both the official ports and the legacy ports
-    # legacy ports can be omitted if your application doesn't depend on them
     listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
     listen-peer-urls: http://$private_ipv4:2380,http://$private_ipv4:7001
-    # Discovery is populated by Terraform
     discovery: ${etcd_discovery_url}
+  fleet:
+    metadata: "role=master,region=${region}"
   units:
     - name: etcd2.service
       command: start

terraform/digitalocean/slave-cloud-config.yml.tpl

@@ -2,16 +2,14 @@
 
 coreos:
   etcd2:
-    # $private_ipv4 is populated by the cloud provider
-    # we don't have a $public_ipv4 in the private VPC
-    advertise-client-urls: http://$private_ipv4:2379,http://$private_ipv4:4001
-    initial-advertise-peer-urls: http://$private_ipv4:2380
-    # listen on both the official ports and the legacy ports
-    # legacy ports can be omitted if your application doesn't depend on them
+    proxy: on
     listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
-    listen-peer-urls: http://$private_ipv4:2380,http://$private_ipv4:7001
-    # Discovery is populated by Terraform
     discovery: ${etcd_discovery_url}
+  fleet:
+    metadata: "role=slave,region=${region}"
+    etcd_servers: "http://localhost:2379"
+  locksmith:
+    endpoint: "http://localhost:2379"
   units:
     - name: etcd2.service
       command: start