From eda1dcb7f68edec6952617f761f664f7b13393df Mon Sep 17 00:00:00 2001 From: Maxime Guyot Date: Tue, 10 Dec 2019 12:41:29 +0100 Subject: [PATCH] Fix TF inventory script (#5424) --- contrib/terraform/terraform.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/terraform/terraform.py b/contrib/terraform/terraform.py index b9f50db48..fbce5cb71 100755 --- a/contrib/terraform/terraform.py +++ b/contrib/terraform/terraform.py @@ -346,7 +346,7 @@ def iter_host_ips(hosts, ips): '''Update hosts that have an entry in the floating IP list''' for host in hosts: host_id = host[1]['id'] - use_access_ip = host[1]['metadata']['use_access_ip'] + if host_id in ips: ip = ips[host_id] @@ -357,8 +357,9 @@ def iter_host_ips(hosts, ips): 'ansible_ssh_host': ip, }) - if use_access_ip == "0": + if 'use_access_ip' in host[1]['metadata'] and ihost[1]['metadata']['use_access_ip'] == "0": host[1].pop('access_ip') + yield host