make zone_id really optional (#13)

Author: oavdeev-hs

main.tf

@@ -65,6 +65,7 @@ resource "aws_security_group" "default" {
 }
 
 data "aws_route53_zone" "domain" {
+  count   = "${var.zone_id != "" ? 1 : 0}"
   zone_id = "${var.zone_id}"
 }
 
@@ -74,8 +75,8 @@ data "template_file" "user_data" {
   vars {
     user_data       = "${join("\n", var.user_data)}"
     welcome_message = "${var.stage}"
-    hostname        = "${var.name}.${data.aws_route53_zone.domain.name}"
-    search_domains  = "${data.aws_route53_zone.domain.name}"
+    hostname        = "${var.name}.${join("",data.aws_route53_zone.domain.*.name)}"
+    search_domains  = "${join("",data.aws_route53_zone.domain.*.name)}"
     ssh_user        = "${var.ssh_user}"
   }
 }
@@ -101,7 +102,9 @@ resource "aws_instance" "default" {
 }
 
 module "dns" {
-  source    = "git::https://github.com/cloudposse/terraform-aws-route53-cluster-hostname.git?ref=tags/0.1.1"
+  enabled   = "${var.zone_id != "" ? true : false }"
+  
+  source    = "git::https://github.com/cloudposse/terraform-aws-route53-cluster-hostname.git?ref=tags/0.2.5"
   namespace = "${var.namespace}"
   name      = "${var.name}"
   stage     = "${var.stage}"