need to include az

warroyo · May 22, 2019 · 426157d · 426157d
1 parent 845366b
commit 426157d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tasks/master-instances.yml b/tasks/master-instances.yml
@@ -50,7 +50,7 @@ run:
     echo "getting master instances"
     #need to initilaize gcloud ssh to get clean output on second run
     gcloud compute ssh --quiet --force-key-file-overwrite --zone "${GCP_ZONE}" ubuntu@sandbox-opsman --command "echo hello"
-    MASTER_INSTANCE_ID=$(gcloud compute ssh --quiet --force-key-file-overwrite --zone "${GCP_ZONE}" ubuntu@sandbox-opsman --command "$BOSH_CMD -d service-instance_${CLUSTER_UUID} vms --json | jq -r -c '.Tables[0].Rows[] | select(.instance | startswith(\"master\")) | .vm_cid'")
+    MASTER_INSTANCE_ID=$(gcloud compute ssh --quiet --force-key-file-overwrite --zone "${GCP_ZONE}" ubuntu@sandbox-opsman --command "$BOSH_CMD -d service-instance_${CLUSTER_UUID} vms --json | jq -r -c '.Tables[0].Rows[] | select(.instance | startswith(\"master\")) | | \"\(.az)/\(.vm_cid)\"'")
     # ./jq -r .ops_manager_ssh_private_key terraform-output/metadata > ops_manager_ssh_private_key.pem
     # chmod 600 ops_manager_ssh_private_key.pem
     # MASTER_INSTANCE_ID=$(ssh -oStrictHostKeyChecking=accept-new -oUserKnownHostsFile=/dev/null ubuntu@${OM_HOST} -i ops_manager_ssh_private_key.pem $BOSH_CMD -d service-instance_${CLUSTER_UUID} vms --json | ./jq -r -c '.Tables[0].Rows[] | select(.instance | startswith("master")) | .vm_cid')

diff --git a/terraforming-k8s/main.tf b/terraforming-k8s/main.tf
@@ -63,8 +63,8 @@ resource "google_compute_address" "lb" {
   count = 1
 }
 
-resource "google_dns_record_set" "cluser-dns" {
-  name = "${var.cluster_name}.${var.dns_zone_dns_name}"
+resource "google_dns_record_set" "cluster-dns" {
+  name = "${var.cluster_name}.${var.dns_zone_dns_name}."
   type = "A"
   ttl  = 300