From 82b050e6b82f2ea6a83a1d45865dfc5428e18957 Mon Sep 17 00:00:00 2001 From: Marcos Alano Date: Thu, 5 Jul 2018 14:57:02 -0300 Subject: [PATCH] Changed 'all' group to 'scaleway' group to avoid conflict with real 'all' group. Closes ##35092 (#42367) --- contrib/inventory/scaleway.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/inventory/scaleway.py b/contrib/inventory/scaleway.py index 7c86843c620..6f1f2d4fb49 100755 --- a/contrib/inventory/scaleway.py +++ b/contrib/inventory/scaleway.py @@ -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):