modules/digitalocean/master: move api dns record to master/dns.tf

Consolidate DNS records in master/dns.tf to align with db1c71e, in
advance of moving to modules/dns at
[request](coreos#604 (comment))
of @enxebre

modules/digitalocean/master/dns.tf

@@ -8,8 +8,22 @@ resource "digitalocean_domain" "console" {
   ip_address = "${digitalocean_loadbalancer.console.ip}"
 }
 
+resource "digitalocean_record" "api" {
+  domain = "${var.base_domain}"
+  type   = "A"
+  name   = "${var.cluster_name}-api"
+  value  = "${digitalocean_floating_ip.master.ip_address}"
+}
+
+resource "digitalocean_record" "console" {
+  domain = "${var.base_domain}"
+  type   = "A"
+  name   = "${var.cluster_name}"
+  value  = "${digitalocean_loadbalancer.console.ip}"
+}
+
 resource "digitalocean_record" "master" {
-  count  = "${var.master_count}"
+  count  = "${var.droplet_count}"
   domain = "${var.base_domain}"
   name   = "${var.cluster_name}-master-${count.index}"
   type   = "A"

modules/digitalocean/master/loadbalancer.tf

@@ -1,13 +1,7 @@
-resource "digitalocean_record" "api" {
-  domain = "${var.base_domain}"
-  type   = "A"
-  name   = "${var.cluster_name}-api"
-  value  = "${digitalocean_floating_ip.master.ip_address}"
-}
-
 resource "digitalocean_loadbalancer" "console" {
-  name   = "${var.cluster_name}-con"
-  region = "${var.droplet_region}"
+  name        = "${var.cluster_name}-console"
+  region      = "${var.droplet_region}"
+  droplet_ids = ["${digitalocean_droplet.master_node.*.id}"]
 
   forwarding_rule {
     entry_port      = 80
@@ -33,10 +27,3 @@ resource "digitalocean_loadbalancer" "console" {
     unhealthy_threshold      = 2
   }
 }
-
-resource "digitalocean_record" "console" {
-  domain = "${var.base_domain}"
-  type   = "A"
-  name   = "${var.cluster_name}"
-  value  = "${digitalocean_loadbalancer.console.ip}"
-}