From d3e30423c48d622cac4d97c96bd9df549c419bfa Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 15 Nov 2018 12:40:02 -0800 Subject: [PATCH] data/aws/route53/variables: Drop unused external_vpc_id and extra_tags The last consumer of these variables were removed by 4360905b (modulus,steps: enable existing vpc, 2018-05-16, coreos/tectonic-installer#3231) back when it was tectonic_external_vpc_id. Now all the route53 module creates are aws_route53_record resources, and they don't support tags [1]. [1]: https://www.terraform.io/docs/providers/aws/r/route53_record.html --- data/data/aws/main.tf | 2 -- data/data/aws/route53/variables.tf | 16 ---------------- 2 files changed, 18 deletions(-) diff --git a/data/data/aws/main.tf b/data/data/aws/main.tf index f0fc7674747..e50aeba8fcf 100644 --- a/data/data/aws/main.tf +++ b/data/data/aws/main.tf @@ -74,8 +74,6 @@ module "dns" { elb_alias_enabled = true master_count = "${var.tectonic_master_count}" private_zone_id = "${local.private_zone_id}" - external_vpc_id = "${module.vpc.vpc_id}" - extra_tags = "${var.tectonic_aws_extra_tags}" private_endpoints = "${local.private_endpoints}" public_endpoints = "${local.public_endpoints}" } diff --git a/data/data/aws/route53/variables.tf b/data/data/aws/route53/variables.tf index e26deecf501..718b7e1d836 100644 --- a/data/data/aws/route53/variables.tf +++ b/data/data/aws/route53/variables.tf @@ -43,11 +43,6 @@ variable "worker_public_ips_enabled" { default = true } -variable "extra_tags" { - type = "map" - description = "Extra tags to be applied to created resources." -} - // AWS specific internal zone variables variable "elb_alias_enabled" { @@ -60,17 +55,6 @@ EOF default = false } -variable "external_vpc_id" { - type = "string" - - description = <