External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-04-05 01:59:30 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #597 from pcm32/patch-1

Browse Source 
Adds missing 'ip' var for terraform-generated inventory, based on internal ip
This commit is contained in:
Matthew Mosesohn
2016-11-14 10:41:21 +03:00
committed by GitHub
parent f6233ffc9a f320b79c0c
commit 1ccc10baf8
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/terraform/terraform.py
View File

@@ -309,6 +309,7 @@ def openstack_host(resource, module_name):
attrs = { attrs = {
'access_ip_v4': raw_attrs['access_ip_v4'], 'access_ip_v4': raw_attrs['access_ip_v4'],
'access_ip_v6': raw_attrs['access_ip_v6'], 'access_ip_v6': raw_attrs['access_ip_v6'],
'ip': raw_attrs['network.0.fixed_ip_v4'],
'flavor': parse_dict(raw_attrs, 'flavor', 'flavor': parse_dict(raw_attrs, 'flavor',
sep='_'), sep='_'),
'id': raw_attrs['id'], 'id': raw_attrs['id'],