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

Clean up some bugs related to --limit on adhoc commands

Browse source
This commit is contained in:
James Cammarata 2015-09-28 09:02:24 -04:00
parent 621575681a
commit babf47decb
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/cli/adhoc.py
View file

@ -18,7 +18,7 @@
######################################################## ########################################################
from ansible import constants as C from ansible import constants as C
from ansible.cli import CLI from ansible.cli import CLI
from ansible.errors import AnsibleOptionsError from ansible.errors import AnsibleError, AnsibleOptionsError
from ansible.executor.task_queue_manager import TaskQueueManager from ansible.executor.task_queue_manager import TaskQueueManager
from ansible.inventory import Inventory from ansible.inventory import Inventory
from ansible.parsing import DataLoader from ansible.parsing import DataLoader
@ -117,10 +117,11 @@ class AdHocCLI(CLI):
self.display.warning("provided hosts list is empty, only localhost is available") self.display.warning("provided hosts list is empty, only localhost is available")
no_hosts = True no_hosts = True
inventory.subset(self.options.subset) if self.options.subset:
if len(inventory.list_hosts()) == 0 and not no_hosts: inventory.subset(self.options.subset)
# Invalid limit if len(inventory.list_hosts()) == 0 and not no_hosts:
raise AnsibleError("Specified --limit does not match any hosts") # Invalid limit
raise AnsibleError("Specified --limit does not match any hosts")
if self.options.listhosts: if self.options.listhosts:
self.display.display(' hosts (%d):' % len(hosts)) self.display.display(' hosts (%d):' % len(hosts))