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

[stable-2.7] Fix reverse_inventory order to work on python3 (#49895) (#50048)

Browse source 
* [stable-2.7] Fix reverse_inventory order to work on python3 (#49895)
(cherry picked from commit a0d71e7)

Co-authored-by: Matt Martz <matt@sivel.net>

* Clarify the change made to reverse_inventory
This commit is contained in:
Matt Martz 2019-01-07 13:12:31 -06:00 committed by Toshio Kuratomi
parent 4561a5007b
commit 2bd8bba297
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/playbook-order-reverse_inventory.yaml Normal file
View file

@ -0,0 +1,3 @@
bugfixes:
- host execution order - Fix ``reverse_inventory`` not to change the order of
the items before reversing on python2 and to not backtrace on python3

7
lib/ansible/inventory/manager.py
View file

@ -24,6 +24,9 @@ import os
import re import re
import itertools import itertools
from operator import attrgetter
from random import shuffle
from ansible import constants as C from ansible import constants as C
from ansible.errors import AnsibleError, AnsibleOptionsError, AnsibleParserError from ansible.errors import AnsibleError, AnsibleOptionsError, AnsibleParserError
from ansible.inventory.data import InventoryData from ansible.inventory.data import InventoryData
@ -368,14 +371,12 @@ class InventoryManager(object):
# sort hosts list if needed (should only happen when called from strategy) # sort hosts list if needed (should only happen when called from strategy)
if order in ['sorted', 'reverse_sorted']: 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')) hosts = sorted(self._hosts_patterns_cache[pattern_hash][:], key=attrgetter('name'), reverse=(order == 'reverse_sorted'))
elif order == 'reverse_inventory': elif order == 'reverse_inventory':
hosts = sorted(self._hosts_patterns_cache[pattern_hash][:], reverse=True) hosts = self._hosts_patterns_cache[pattern_hash][::-1]
else: else:
hosts = self._hosts_patterns_cache[pattern_hash][:] hosts = self._hosts_patterns_cache[pattern_hash][:]
if order == 'shuffle': if order == 'shuffle':
from random import shuffle
shuffle(hosts) shuffle(hosts)
elif order not in [None, 'inventory']: elif order not in [None, 'inventory']:
raise AnsibleOptionsError("Invalid 'order' specified for inventory hosts: %s" % order) raise AnsibleOptionsError("Invalid 'order' specified for inventory hosts: %s" % order)