Merge remote branch 'public/integration'

This commit is contained in:
Michael DeHaan 2012-04-02 20:02:46 -04:00
commit e5d5b072db
5 changed files with 92 additions and 57 deletions

View file

@ -457,7 +457,7 @@ class PlayBook(object):
SETUP_CACHE[host] = result
if self.extra_vars:
extra_vars = utils.parse_kv(shlex.split(self.extra_vars))
extra_vars = utils.parse_kv(self.extra_vars)
for h in self.host_list:
try:
SETUP_CACHE[h].update(extra_vars)