C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix TF inventory script (#5424)

Browse source
This commit is contained in:
Maxime Guyot 2019-12-10 12:41:29 +01:00 committed by Kubernetes Prow Robot
parent 5e0140d62c
commit eda1dcb7f6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/terraform/terraform.py
View file

@ -346,7 +346,7 @@ def iter_host_ips(hosts, ips):
'''Update hosts that have an entry in the floating IP list''' '''Update hosts that have an entry in the floating IP list'''
for host in hosts: for host in hosts:
host_id = host[1]['id'] host_id = host[1]['id']
use_access_ip = host[1]['metadata']['use_access_ip']
if host_id in ips: if host_id in ips:
ip = ips[host_id] ip = ips[host_id]
@ -357,8 +357,9 @@ def iter_host_ips(hosts, ips):
'ansible_ssh_host': ip, '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') host[1].pop('access_ip')
yield host yield host