Use EIP based DNS name as a public_dns output (#6)

Author: SweetOps

README.md

@@ -87,10 +87,10 @@ resource "aws_ami_from_instance" "example" {
 | Name                | Description                                                        |
 |:--------------------|:-------------------------------------------------------------------|
 | `id`                | Disambiguated ID                                                   |
-| `public_dns`        | Normalized name                                                    |
-| `public_ip`         | Normalized namespace                                               |
 | `private_dns`       | Normalized name                                                    |
 | `private_ip`        | Normalized namespace                                               |
+| `public_ip`         | Public IP of instance (or EIP )                                    |
+| `public_dns`        | Public DNS of instance (or DNS of EIP)                             |
 | `ssh_key_pair`      | Name of used AWS SSH key                                           |
 | `security_group_id` | ID on the new AWS Security Group associated with creating instance |
 | `role`              | Name of AWS IAM Role associated with creating instance             |

main.tf

@@ -106,22 +106,21 @@ resource "aws_instance" "default" {
 }
 
 resource "aws_eip" "default" {
-  count    = "${signum(length(var.associate_public_ip_address)) == 1 ? 1 : 0}"
+  count    = "${var.associate_public_ip_address ? 1 : 0}"
   instance = "${aws_instance.default.id}"
   vpc      = true
 }
 
 # Apply the provisioner module for this resource
 module "ansible" {
-  source    = "git::https://github.com/cloudposse/tf_ansible.git?ref=tags/0.3.4"
+  source    = "git::https://github.com/cloudposse/tf_ansible.git?ref=tags/0.3.6"
   arguments = "${var.ansible_arguments}"
-  envs      = "${compact(concat(var.ansible_envs, list("host=${var.associate_public_ip_address ? aws_instance.default.public_dns : aws_instance.default.private_dns }")))}"
+  envs      = "${compact(concat(var.ansible_envs, list("host=${var.associate_public_ip_address ? join("", aws_eip.default.*.public_ip) : aws_instance.default.private_ip }")))}"
   playbook  = "${var.ansible_playbook}"
   dry_run   = "${var.ansible_dry_run}"
 }
 
 # Restart dead or hung instance
-
 data "aws_region" "default" {
   current = true
 }
@@ -153,3 +152,11 @@ resource "aws_cloudwatch_metric_alarm" "default" {
     "${null_resource.check_alarm_action.triggers.action}",
   ]
 }
+
+resource "null_resource" "eip" {
+  count = "${var.associate_public_ip_address ? 1 : 0}"
+
+  triggers {
+    public_dns = "ec2-${replace(aws_eip.default.public_ip, ".", "-")}.${data.aws_region.default.name == "us-east-1" ? "compute-1" : "${data.aws_region.default.name}.compute"}.amazonaws.com"
+  }
+}

outputs.tf

@@ -1,5 +1,5 @@
 output "public_ip" {
-  value = "${aws_eip.default.public_ip}"
+  value = "${coalesce(join("", aws_eip.default.*.public_ip), aws_instance.default.public_ip)}"
 }
 
 output "private_ip" {
@@ -11,7 +11,7 @@ output "private_dns" {
 }
 
 output "public_dns" {
-  value = "${aws_instance.default.public_dns}"
+  value = "${coalesce(join("", null_resource.eip.*.triggers.public_dns), aws_instance.default.public_dns)}"
 }
 
 output "id" {