diff options
| author | Marcos Alano <marcoshalano@gmail.com> | 2018-07-05 14:57:02 -0300 |
|---|---|---|
| committer | Sam Doran <sdoran@redhat.com> | 2018-07-05 13:57:02 -0400 |
| commit | 82b050e6b82f2ea6a83a1d45865dfc5428e18957 (patch) | |
| tree | 4709e6a2a3268173375373d52755cbbab72af22a /contrib | |
| parent | b90ae65e5c535286d2fd7695fff303f90f8c0611 (diff) | |
| download | ansible-82b050e6b82f2ea6a83a1d45865dfc5428e18957.tar.gz | |
Changed 'all' group to 'scaleway' group to avoid conflict with real 'all' group. Closes ##35092 (#42367)
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/inventory/scaleway.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/inventory/scaleway.py b/contrib/inventory/scaleway.py index 7c86843c62..6f1f2d4fb4 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): |