diff --git a/data/data/aws/main.tf b/data/data/aws/main.tf index 4e02bc114e2..d580ab3a3c7 100644 --- a/data/data/aws/main.tf +++ b/data/data/aws/main.tf @@ -117,14 +117,6 @@ resource "aws_route53_record" "etcd_a_nodes" { records = ["${module.masters.ip_addresses[count.index]}"] } -resource "aws_route53_record" "etcd_cluster_old_srvs" { - type = "SRV" - ttl = "60" - zone_id = "${local.private_zone_id}" - name = "_etcd-server-ssl._tcp" - records = ["${formatlist("0 10 2380 %s", aws_route53_record.etcd_a_nodes.*.fqdn)}"] -} - resource "aws_route53_record" "etcd_cluster" { type = "SRV" ttl = "60" diff --git a/data/data/libvirt/main.tf b/data/data/libvirt/main.tf index 99bbe42d9aa..3866cd5f068 100644 --- a/data/data/libvirt/main.tf +++ b/data/data/libvirt/main.tf @@ -51,7 +51,6 @@ resource "libvirt_network" "tectonic_net" { srvs = ["${flatten(list( data.libvirt_network_dns_srv_template.etcd_cluster.*.rendered, - data.libvirt_network_dns_srv_template.etcd_cluster_old_srvs.*.rendered, ))}"] hosts = ["${flatten(list( @@ -121,16 +120,6 @@ data "libvirt_network_dns_host_template" "workers" { hostname = "${var.tectonic_cluster_name}" } -data "libvirt_network_dns_srv_template" "etcd_cluster_old_srvs" { - count = "${var.tectonic_master_count}" - service = "etcd-server-ssl" - protocol = "tcp" - domain = "${var.tectonic_base_domain}" - port = 2380 - weight = 10 - target = "${var.tectonic_cluster_name}-etcd-${count.index}.${var.tectonic_base_domain}" -} - data "libvirt_network_dns_srv_template" "etcd_cluster" { count = "${var.tectonic_master_count}" service = "etcd-server-ssl"