mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Fix reverse_inventory order to work on python3 (#49895)
This commit is contained in:
parent
ba562043e1
commit
a0d71e7735
2 changed files with 6 additions and 3 deletions
2
changelogs/fragments/playbook-order-py3.yaml
Normal file
2
changelogs/fragments/playbook-order-py3.yaml
Normal file
|
@ -0,0 +1,2 @@
|
|||
bugfixes:
|
||||
- host execution order - Fix ``reverse_inventory`` to work on python3
|
|
@ -24,6 +24,9 @@ import os
|
|||
import re
|
||||
import itertools
|
||||
|
||||
from operator import attrgetter
|
||||
from random import shuffle
|
||||
|
||||
from ansible import constants as C
|
||||
from ansible.errors import AnsibleError, AnsibleOptionsError, AnsibleParserError
|
||||
from ansible.inventory.data import InventoryData
|
||||
|
@ -367,14 +370,12 @@ class InventoryManager(object):
|
|||
|
||||
# sort hosts list if needed (should only happen when called from strategy)
|
||||
if order in ['sorted', 'reverse_sorted']:
|
||||
from operator import attrgetter
|
||||
hosts = sorted(self._hosts_patterns_cache[pattern_hash][:], key=attrgetter('name'), reverse=(order == 'reverse_sorted'))
|
||||
elif order == 'reverse_inventory':
|
||||
hosts = sorted(self._hosts_patterns_cache[pattern_hash][:], reverse=True)
|
||||
hosts = self._hosts_patterns_cache[pattern_hash][::-1]
|
||||
else:
|
||||
hosts = self._hosts_patterns_cache[pattern_hash][:]
|
||||
if order == 'shuffle':
|
||||
from random import shuffle
|
||||
shuffle(hosts)
|
||||
elif order not in [None, 'inventory']:
|
||||
raise AnsibleOptionsError("Invalid 'order' specified for inventory hosts: %s" % order)
|
||||
|
|
Loading…
Reference in a new issue