Change hostvars to a mutable mapping to more closely resemble a dict

Fixes #4030
This commit is contained in:
James Cammarata 2013-09-05 23:04:16 -05:00
parent 06090b5cb6
commit ae9e38daf8

View file

@ -81,13 +81,20 @@ def _executor_hook(job_queue, result_queue, new_stdin):
except: except:
traceback.print_exc() traceback.print_exc()
class HostVars(collections.Mapping): class HostVars(collections.MutableMapping):
''' 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):
self.setup_cache = setup_cache self.setup_cache = setup_cache
self.inventory = inventory self.inventory = inventory
self.lookup = {} self.lookup = dict()
self.update(setup_cache)
def __setitem__(self, host, value):
self.lookup[host] = value
def __delitem__(self, host):
del self.lookup[host]
def __getitem__(self, host): def __getitem__(self, host):
if not host in self.lookup: if not host in self.lookup:
@ -97,10 +104,10 @@ class HostVars(collections.Mapping):
return self.lookup[host] return self.lookup[host]
def __iter__(self): def __iter__(self):
return (host.name for host in self.inventory.get_group('all').hosts) return iter(self.lookup)
def __len__(self): def __len__(self):
return len(self.inventory.get_group('all').hosts) return len(self.lookup)
class Runner(object): class Runner(object):