kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3069 from magnuhho/master 

contrib/terraform/terraform.py: fix for Ansible 2.6.2+, issue #3067
pull/1539/merge
Rong Zhang 2018-08-08 11:52:07 +08:00 committed by GitHub
parent f72d74f951 fcfe12437c
commit 4c0e723ead
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/terraform/terraform.py
View File

@ -706,6 +706,10 @@ def query_list(hosts):
for name, attrs, hostgroups in hosts: for name, attrs, hostgroups in hosts:
for group in set(hostgroups): for group in set(hostgroups):
# Ansible 2.6.2 stopped supporting empty group names: https://github.com/ansible/ansible/pull/42584/commits/d4cd474b42ed23d8f8aabb2a7f84699673852eaf
# Empty group name defaults to "all" in Ansible < 2.6.2 so we alter empty group names to "all"
if not group: group = "all"
groups[group].setdefault('hosts', []) groups[group].setdefault('hosts', [])
groups[group]['hosts'].append(name) groups[group]['hosts'].append(name)