a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3169 from Debilski/fix-duplicate-host-reads 

Allow inventory to be read from a pipe
pull/4420/head
Michael DeHaan 2013-06-16 20:22:54 -07:00
parent fe9849530c 71afb9e432
commit aa340c1508
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ansible/inventory/__init__.py
View File

@ -90,12 +90,8 @@ class Inventory(object):
self.parser = InventoryScript(filename=host_list) self.parser = InventoryScript(filename=host_list)
self.groups = self.parser.groups.values() self.groups = self.parser.groups.values()
else: else:
data = file(host_list).read()
if not data.startswith("---"):
self.parser = InventoryParser(filename=host_list) self.parser = InventoryParser(filename=host_list)
self.groups = self.parser.groups.values() self.groups = self.parser.groups.values()
else:
raise errors.AnsibleError("YAML inventory support is deprecated in 0.6 and removed in 0.7, see the migration script in examples/scripts in the git checkout")
utils.plugins.vars_loader.add_directory(self.basedir(), with_subdir=True) utils.plugins.vars_loader.add_directory(self.basedir(), with_subdir=True)
else: else:

2
lib/ansible/inventory/ini.py
View File

@ -33,7 +33,7 @@ class InventoryParser(object):
def __init__(self, filename=C.DEFAULT_HOST_LIST): def __init__(self, filename=C.DEFAULT_HOST_LIST):
fh = open(filename) with open(filename) as fh:
self.lines = fh.readlines() self.lines = fh.readlines()
self.groups = {} self.groups = {}
self.hosts = {} self.hosts = {}