From 99bf97aa794dbbca5c1bbe5dcbae7da4c2fda591 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Wed, 7 Jun 2017 13:51:07 -0700 Subject: [PATCH] Fix etcd_servers interpolation and example --- assets.tf | 4 ++-- terraform.tfvars.example | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets.tf b/assets.tf index 58912c8..99ec7ba 100644 --- a/assets.tf +++ b/assets.tf @@ -5,7 +5,7 @@ resource "template_dir" "bootstrap-manifests" { vars { hyperkube_image = "${var.container_images["hyperkube"]}" - etcd_servers = "${var.experimental_self_hosted_etcd ? format("http://%s:2379,http://127.0.0.1:12379", cidrhost(var.service_cidr, 15)) : join(",", var.etcd_servers)}" + etcd_servers = "${var.experimental_self_hosted_etcd ? format("http://%s:2379", cidrhost(var.service_cidr, 15)) : join(",", formatlist("https://%s:2379", var.etcd_servers))}" cloud_provider = "${var.cloud_provider}" pod_cidr = "${var.pod_cidr}" @@ -25,7 +25,7 @@ resource "template_dir" "manifests" { vars { hyperkube_image = "${var.container_images["hyperkube"]}" - etcd_servers = "${var.experimental_self_hosted_etcd ? format("http://%s:2379", cidrhost(var.service_cidr, 15)) : join(",", var.etcd_servers)}" + etcd_servers = "${var.experimental_self_hosted_etcd ? format("http://%s:2379", cidrhost(var.service_cidr, 15)) : join(",", formatlist("https://%s:2379", var.etcd_servers))}" cloud_provider = "${var.cloud_provider}" diff --git a/terraform.tfvars.example b/terraform.tfvars.example index 2360356..fd3642b 100644 --- a/terraform.tfvars.example +++ b/terraform.tfvars.example @@ -1,5 +1,5 @@ cluster_name = "example" api_servers = ["node1.example.com"] -etcd_servers = ["https://node1.example.com:2379"] +etcd_servers = ["node1.example.com"] asset_dir = "/home/core/clusters/mycluster" experimental_self_hosted_etcd = false