ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

make inventory warnings a bit smarter (#46284)

Browse source 
less annoying for common cases
 add comment for 'tricky' conditional
This commit is contained in:
Brian Coca 2018-11-07 11:09:32 -05:00 committed by GitHub
parent 4961f003e5
commit 903cfa63cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/cli/__init__.py
View file

@ -807,7 +807,7 @@ class CLI(with_metaclass(ABCMeta, object)):
no_hosts = False no_hosts = False
if len(inventory.list_hosts()) == 0: if len(inventory.list_hosts()) == 0:
# Empty inventory # Empty inventory
if C.LOCALHOST_WARNING: if C.LOCALHOST_WARNING and pattern not in C.LOCALHOST:
display.warning("provided hosts list is empty, only localhost is available. Note that the implicit localhost does not match 'all'") display.warning("provided hosts list is empty, only localhost is available. Note that the implicit localhost does not match 'all'")
no_hosts = True no_hosts = True

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

@ -289,7 +289,9 @@ class InventoryManager(object):
if C.INVENTORY_ANY_UNPARSED_IS_FAILED: if C.INVENTORY_ANY_UNPARSED_IS_FAILED:
raise AnsibleError(u'Completely failed to parse inventory source %s' % (source)) raise AnsibleError(u'Completely failed to parse inventory source %s' % (source))
if not parsed: if not parsed:
display.warning("Unable to parse %s as an inventory source" % source) if source != '/etc/ansible/hosts' or os.path.exists(source):
# only warn if NOT using the default and if using it, only if the file is present
display.warning("Unable to parse %s as an inventory source" % source)
# clear up, jic # clear up, jic
self._inventory.current_source = None self._inventory.current_source = None