From 951346ad49199e3b1fa1295a6971271e474479d6 Mon Sep 17 00:00:00 2001
From: Brett Meehan <bmeehan@atlassian.com>
Date: Fri, 5 Jul 2019 16:04:18 +1000
Subject: [PATCH] ITOPS-1671 get clusternode from ec2_facts else fqdn

---
 roles/aws_common/tasks/main.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/roles/aws_common/tasks/main.yml b/roles/aws_common/tasks/main.yml
index d658d80..a47db5b 100644
--- a/roles/aws_common/tasks/main.yml
+++ b/roles/aws_common/tasks/main.yml
@@ -7,8 +7,9 @@
   ec2_metadata_facts:
   tags:
     - notest
+  ignore_errors: yes
 
 - name: Use EC2 instance ID for cluster node ID
   set_fact:
-    atl_cluster_node_id: "{{ ansible_ec2_instance_id }}"
-    atl_local_ipv4: "{{ ansible_ec2_local_ipv4 | default(ansible_default_ipv4) }}"
+    atl_cluster_node_id: "{{ ansible_ec2_instance_id | default(ansible_fqdn) }}"
+    atl_local_ipv4: "{{ ansible_ec2_local_ipv4 | default(ansible_default_ipv4.address) }}"