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

When iterating over hostvars yield the hostname not the host object

Browse source 
Also fixes HostVars to raise the correct jinja2 error type.

Fixes #16836
This commit is contained in:
James Cammarata 2016-11-21 02:03:16 -06:00
parent 69649358b1
commit 0df3767d4d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/vars/hostvars.py
View file

@ -21,7 +21,7 @@ __metaclass__ = type
import collections import collections
from jinja2 import Undefined as j2undefined from jinja2.exceptions import UndefinedError
from ansible import constants as C from ansible import constants as C
from ansible.template import Templar from ansible.template import Templar
@ -73,7 +73,7 @@ class HostVars(collections.Mapping):
''' '''
host = self._find_host(host_name) host = self._find_host(host_name)
if host is None: if host is None:
raise j2undefined raise UndefinedError("%s not found in hostvars" % host_name)
return self._variable_manager.get_vars(loader=self._loader, host=host, include_hostvars=False) return self._variable_manager.get_vars(loader=self._loader, host=host, include_hostvars=False)
@ -102,7 +102,7 @@ class HostVars(collections.Mapping):
def __iter__(self): def __iter__(self):
for host in self._inventory.get_hosts(ignore_limits=True, ignore_restrictions=True): for host in self._inventory.get_hosts(ignore_limits=True, ignore_restrictions=True):
yield host yield host.name
def __len__(self): def __len__(self):
return len(self._inventory.get_hosts(ignore_limits=True, ignore_restrictions=True)) return len(self._inventory.get_hosts(ignore_limits=True, ignore_restrictions=True))