update aws terraform code

contrib/terraform/aws/create-infrastructure.tf

@@ -153,27 +153,40 @@ resource "aws_instance" "k8s-worker" {
 * Create Kubespray Inventory File
 *
 */
-data "template_file" "inventory" {
- template = file("${path.module}/templates/inventory.tpl")
-
- vars = {
- public_ip_address_bastion = join("\n", formatlist("bastion ansible_host=%s", aws_instance.bastion-server.*.public_ip))
- connection_strings_master = join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-master.*.private_dns, aws_instance.k8s-master.*.private_ip))
- connection_strings_node = join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-worker.*.private_dns, aws_instance.k8s-worker.*.private_ip))
- list_master = join("\n", aws_instance.k8s-master.*.private_dns)
- list_node = join("\n", aws_instance.k8s-worker.*.private_dns)
- connection_strings_etcd = join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-etcd.*.private_dns, aws_instance.k8s-etcd.*.private_ip))
- list_etcd = join("\n", ((var.aws_etcd_num > 0) ? (aws_instance.k8s-etcd.*.private_dns) : (aws_instance.k8s-master.*.private_dns)))
- nlb_api_fqdn = "apiserver_loadbalancer_domain_name=\"${module.aws-nlb.aws_nlb_api_fqdn}\""
- }
+# data "template_file" "inventory" {
+# template = file("${path.module}/templates/inventory.tpl")
+
+# vars = {
+# public_ip_address_bastion = join("\n", formatlist("bastion ansible_host=%s", aws_instance.bastion-server.*.public_ip))
+# connection_strings_master = join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-master.*.private_dns, aws_instance.k8s-master.*.private_ip))
+# connection_strings_node = join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-worker.*.private_dns, aws_instance.k8s-worker.*.private_ip))
+# list_master = join("\n", aws_instance.k8s-master.*.private_dns)
+# list_node = join("\n", aws_instance.k8s-worker.*.private_dns)
+# connection_strings_etcd = join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-etcd.*.private_dns, aws_instance.k8s-etcd.*.private_ip))
+# list_etcd = join("\n", ((var.aws_etcd_num > 0) ? (aws_instance.k8s-etcd.*.private_dns) : (aws_instance.k8s-master.*.private_dns)))
+# nlb_api_fqdn = "apiserver_loadbalancer_domain_name=\"${module.aws-nlb.aws_nlb_api_fqdn}\""
+# }
+# }
+
+locals {
+ inventory = templatefile("${path.module}/templates/inventory.tpl", {
+ public_ip_address_bastion = join("\n", formatlist("bastion ansible_host=%s", aws_instance.bastion-server.*.public_ip))
+ connection_strings_master = join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-master.*.private_dns, aws_instance.k8s-master.*.private_ip))
+ connection_strings_node = join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-worker.*.private_dns, aws_instance.k8s-worker.*.private_ip))
+ list_master = join("\n", aws_instance.k8s-master.*.private_dns)
+ list_node = join("\n", aws_instance.k8s-worker.*.private_dns)
+ connection_strings_etcd = join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-etcd.*.private_dns, aws_instance.k8s-etcd.*.private_ip))
+ list_etcd = join("\n", ((var.aws_etcd_num > 0) ? (aws_instance.k8s-etcd.*.private_dns) : (aws_instance.k8s-master.*.private_dns)))
+ nlb_api_fqdn = "apiserver_loadbalancer_domain_name=\"${module.aws-nlb.aws_nlb_api_fqdn}\""
+ })
 }
 
 resource "null_resource" "inventories" {
  provisioner "local-exec" {
- command = "echo '${data.template_file.inventory.rendered}' > ${var.inventory_file}"
+ command = "echo '${local.inventory}' > ${var.inventory_file}"
  }
 
  triggers = {
- template = data.template_file.inventory.rendered
+ template = local.inventory
  }
 }

contrib/terraform/aws/output.tf

@@ -19,7 +19,7 @@ output "aws_nlb_api_fqdn" {
 }
 
 output "inventory" {
- value = data.template_file.inventory.rendered
+ value = local.inventory
 }
 
 output "default_tags" {