Make build work

coreos · Jul 19, 2017 · 59aa3de · 59aa3de
1 parent 9e791b9
commit 59aa3de
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/modules/digitalocean/ignition/variables.tf b/modules/digitalocean/ignition/variables.tf
@@ -21,6 +21,7 @@ variable "kubelet_node_taints" {
 variable "bootkube_service" {
   type = "string"
   description = "The content of the bootkube systemd service unit"
+  default = ""
 }
 
 variable "swap_size" {

diff --git a/modules/digitalocean/worker/variables.tf b/modules/digitalocean/worker/variables.tf
@@ -1,4 +1,4 @@
-variable "instance_count" {
+variable "droplet_count" {
   type = "string"
 }
 

diff --git a/modules/digitalocean/worker/worker.tf b/modules/digitalocean/worker/worker.tf
@@ -1,5 +1,5 @@
 resource "digitalocean_droplet" "worker_node" {
-  count = "${var.instance_count}"
+  count = "${var.droplet_count}"
   name = "${var.cluster_name}-worker-${count.index}"
   image = "${var.droplet_image}"
   region = "${var.droplet_region}"
@@ -10,7 +10,7 @@ resource "digitalocean_droplet" "worker_node" {
 }
 
 resource "digitalocean_record" "worker" {
-  count = "${var.instance_count}"
+  count = "${var.droplet_count}"
   domain = "${var.cluster_domain}"
   type = "A"
   name = "${var.cluster_name}-worker-${count.index}"

diff --git a/platforms/digitalocean/README.md b/platforms/digitalocean/README.md
@@ -0,0 +1,4 @@
+# Tectonic Installer for DigitalOcean
+
+## etcd
+We create an etcd cluster with a default of 3 droplets (controlled by `tectonic_etcd_count`).
diff --git a/platforms/digitalocean/main.tf b/platforms/digitalocean/main.tf
@@ -60,14 +60,13 @@ module "ignition-workers" {
   kube_dns_service_ip = "${module.bootkube.kube_dns_service_ip}"
   container_images = "${var.tectonic_container_images}"
   swap_size = "${var.tectonic_do_worker_swap}"
-  bootkube_service = ""
   cluster_domain = "${var.tectonic_cluster_name}.k8s.${var.tectonic_base_domain}"
 }
 
 module "workers" {
   source = "../../modules/digitalocean/worker"
 
-  instance_count = "${var.tectonic_worker_count}"
+  droplet_count = "${var.tectonic_worker_count}"
   cluster_name = "${var.tectonic_cluster_name}"
   droplet_size = "${var.tectonic_do_worker_droplet_size}"
   droplet_region = "${var.tectonic_do_droplet_region}"

diff --git a/platforms/digitalocean/tectonic.tf b/platforms/digitalocean/tectonic.tf
@@ -22,6 +22,16 @@ module "bootkube" {
   etcd_client_key = "${var.tectonic_etcd_client_key_path}"
   experimental_enabled = "${var.tectonic_experimental}"
   versions = "${var.tectonic_versions}"
+  master_count = 1
+  etcd_cert_dns_names = [
+    "${var.tectonic_cluster_name}-etcd-0.${var.tectonic_base_domain}",
+    "${var.tectonic_cluster_name}-etcd-1.${var.tectonic_base_domain}",
+    "${var.tectonic_cluster_name}-etcd-2.${var.tectonic_base_domain}",
+    "${var.tectonic_cluster_name}-etcd-3.${var.tectonic_base_domain}",
+    "${var.tectonic_cluster_name}-etcd-4.${var.tectonic_base_domain}",
+    "${var.tectonic_cluster_name}-etcd-5.${var.tectonic_base_domain}",
+    "${var.tectonic_cluster_name}-etcd-6.${var.tectonic_base_domain}",
+  ]
 }
 
 module "tectonic" {
@@ -49,6 +59,7 @@ module "tectonic" {
   ingress_kind = "NodePort"
   experimental = "${var.tectonic_experimental}"
   master_count = 1
+  stats_url = "${var.tectonic_stats_url}"
 }
 
 data "archive_file" "assets" {