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

Fix inconsistency in hostvars access.

Browse source 
Previously, hostvars would only expose a keys() list of hosts that had
been seen yet- however you could explicitly access the host if you knew
the name, and get the content that way.  This precludes template code
from being able to safely access information about other hosts if any
limiters/tags were in use.

Additionally, the object was inconsistent for hostvars['myhost'] access
and [x[1] for x in hostvars.items() if x[0] == 'myhost'] access; this is
due to the original derivation from the dict object.  .items() would be
handled by dict.items(), using the passed in setup_cache values without
using the actual lookup content.

This patch rebases the class implementation to a py2.6 dictmixin, fixing
those issues and restoring behaviour to match what the docs claim.
This commit is contained in:
Brian Harring 2013-08-19 23:52:03 -04:00
parent 0747d41e76
commit 31061213fa
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/runner/__init__.py
View file

@ -81,7 +81,7 @@ def _executor_hook(job_queue, result_queue, new_stdin):
except: except:
traceback.print_exc() traceback.print_exc()
class HostVars(dict): class HostVars(collections.Mapping):
''' A special view of setup_cache that adds values from the inventory when needed. ''' ''' A special view of setup_cache that adds values from the inventory when needed. '''
def __init__(self, setup_cache, inventory): def __init__(self, setup_cache, inventory):
@ -89,8 +89,6 @@ class HostVars(dict):
self.inventory = inventory self.inventory = inventory
self.lookup = {} self.lookup = {}
self.update(setup_cache)
def __getitem__(self, host): def __getitem__(self, host):
if not host in self.lookup: if not host in self.lookup:
result = self.inventory.get_variables(host) result = self.inventory.get_variables(host)
@ -98,8 +96,12 @@ class HostVars(dict):
self.lookup[host] = result self.lookup[host] = result
return self.lookup[host] return self.lookup[host]
def __contains__(self, host): def __iter__(self):
return host in self.lookup or host in self.setup_cache or self.inventory.get_host(host) return (host.name for host in self.inventory.get_group('all').hosts)
def __len__(self):
return len(self.inventory.get_group('all').hosts)
class Runner(object): class Runner(object):
''' core API interface to ansible ''' ''' core API interface to ansible '''