cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed 'all' group to 'scaleway' group to avoid conflict with real 'all' group. Closes ##35092 (#42367)

Browse source
This commit is contained in:
Marcos Alano 2018-07-05 14:57:02 -03:00 committed by Sam Doran
parent b90ae65e5c
commit 82b050e6b8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/inventory/scaleway.py
View file

@ -150,7 +150,7 @@ def cache_available(config):
def generate_inv_from_api(config):
try:
inventory['all'] = copy.deepcopy(EMPTY_GROUP)
inventory['scaleway'] = copy.deepcopy(EMPTY_GROUP)
if config.has_option('auth', 'api_token'):
auth_token = config.get('auth', 'api_token')
@ -186,7 +186,7 @@ def generate_inv_from_api(config):
if region not in inventory:
inventory[region] = copy.deepcopy(EMPTY_GROUP)
inventory[region]['children'].append(hostname)
inventory['all']['children'].append(hostname)
inventory['scaleway']['children'].append(hostname)
inventory[hostname] = []
inventory[hostname].append(ip)
@ -194,7 +194,7 @@ def generate_inv_from_api(config):
except Exception:
# Return empty hosts output
traceback.print_exc()
return {'all': {'hosts': []}, '_meta': {'hostvars': {}}}
return {'scaleway': {'hosts': []}, '_meta': {'hostvars': {}}}
def get_inventory(config):