Merge pull request #2353 from s-urbaniak/fix-missing-custom-dns-name

platforms/aws: fix missing tectonic_dns_name
coreos · Nov 10, 2017 · 7e9e368 · 7e9e368
2 parents 4c4e410 + d201b61
commit 7e9e368
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/platforms/aws/main.tf b/platforms/aws/main.tf
@@ -15,19 +15,20 @@ module "container_linux" {
 module "vpc" {
   source = "../../modules/aws/vpc"
 
-  cidr_block               = "${var.tectonic_aws_vpc_cidr_block}"
   base_domain              = "${var.tectonic_base_domain}"
-  cluster_name             = "${var.tectonic_cluster_name}"
-  external_vpc_id          = "${var.tectonic_aws_external_vpc_id}"
-  external_master_subnets  = "${compact(var.tectonic_aws_external_master_subnet_ids)}"
-  external_worker_subnets  = "${compact(var.tectonic_aws_external_worker_subnet_ids)}"
+  cidr_block               = "${var.tectonic_aws_vpc_cidr_block}"
   cluster_id               = "${module.tectonic.cluster_id}"
-  extra_tags               = "${var.tectonic_aws_extra_tags}"
+  cluster_id               = "${module.tectonic.cluster_id}"
+  cluster_name             = "${var.tectonic_cluster_name}"
+  custom_dns_name          = "${var.tectonic_dns_name}"
   enable_etcd_sg           = "${var.tectonic_self_hosted_etcd == "" && length(compact(var.tectonic_etcd_servers)) == 0 ? 1 : 0}"
-  external_vpc_id          = "${var.tectonic_aws_external_vpc_id}"
   external_master_subnets  = "${compact(var.tectonic_aws_external_master_subnet_ids)}"
+  external_master_subnets  = "${compact(var.tectonic_aws_external_master_subnet_ids)}"
+  external_vpc_id          = "${var.tectonic_aws_external_vpc_id}"
+  external_vpc_id          = "${var.tectonic_aws_external_vpc_id}"
   external_worker_subnets  = "${compact(var.tectonic_aws_external_worker_subnet_ids)}"
-  cluster_id               = "${module.tectonic.cluster_id}"
+  external_worker_subnets  = "${compact(var.tectonic_aws_external_worker_subnet_ids)}"
+  extra_tags               = "${var.tectonic_aws_extra_tags}"
   extra_tags               = "${var.tectonic_aws_extra_tags}"
   private_master_endpoints = "${var.tectonic_aws_private_endpoints}"
   public_master_endpoints  = "${var.tectonic_aws_public_endpoints}"
@@ -205,6 +206,7 @@ module "dns" {
   cluster_name                   = "${var.tectonic_cluster_name}"
   console_elb_dns_name           = "${module.vpc.aws_console_dns_name}"
   console_elb_zone_id            = "${module.vpc.aws_elb_onsole_zone_id}"
+  custom_dns_name                = "${var.tectonic_dns_name}"
   elb_alias_enabled              = true
   etcd_count                     = "${length(data.template_file.etcd_hostname_list.*.id)}"
   etcd_ips                       = "${module.etcd.ip_addresses}"