From e6c88db0a0d2560f2e5c1aff45921ee054523631 Mon Sep 17 00:00:00 2001
From: Aivars Sterns <Atoms@users.noreply.github.com>
Date: Thu, 2 Nov 2017 14:26:11 +0200
Subject: [PATCH] change how terraform generates apiserver variables (#1922)
---
contrib/terraform/aws/create-infrastructure.tf | 3 +--
contrib/terraform/aws/templates/inventory.tpl | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/contrib/terraform/aws/create-infrastructure.tf b/contrib/terraform/aws/create-infrastructure.tf
index c332ea9bc..f07ed55a8 100644
--- a/contrib/terraform/aws/create-infrastructure.tf
+++ b/contrib/terraform/aws/create-infrastructure.tf
@@ -172,8 +172,7 @@ data "template_file" "inventory" {
list_node = "${join("\n",aws_instance.k8s-worker.*.tags.Name)}"
list_etcd = "${join("\n",aws_instance.k8s-etcd.*.tags.Name)}"
elb_api_fqdn = "apiserver_loadbalancer_domain_name=\"${module.aws-elb.aws_elb_api_fqdn}\""
- elb_api_port = "loadbalancer_apiserver.port=${var.aws_elb_api_port}"
- loadbalancer_apiserver_address = "loadbalancer_apiserver.address=${var.loadbalancer_apiserver_address}"
+ elb_api_server = "loadbalancer_apiserver={\"port\": ${var.aws_elb_api_port}, \"address\": \"${var.loadbalancer_apiserver_address}\"}"
}
}
diff --git a/contrib/terraform/aws/templates/inventory.tpl b/contrib/terraform/aws/templates/inventory.tpl
index 0e64902b1..8354f6b7f 100644
--- a/contrib/terraform/aws/templates/inventory.tpl
+++ b/contrib/terraform/aws/templates/inventory.tpl
@@ -25,5 +25,4 @@ kube-master
[k8s-cluster:vars]
${elb_api_fqdn}
-${elb_api_port}
-${loadbalancer_apiserver_address}
+${elb_api_server}
--
GitLab