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

removed redundant inventory call, moved grousp to proper priority

Browse source
This commit is contained in:
Brian Coca 2015-03-09 10:27:59 -04:00
parent 4fa51652b4
commit 5453e2cbb8
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -673,12 +673,11 @@ class Runner(object):
# Then we selectively merge some variable dictionaries down to a
# single dictionary, used to template the HostVars for this host
temp_vars = self.inventory.get_variables(host, vault_password=self.vault_pass)
temp_vars = utils.combine_vars(temp_vars, inject['combined_cache'])
temp_vars = inject['combined_cache']
temp_vars = utils.combine_vars(temp_vars, {'groups': inject['groups']})
temp_vars = utils.combine_vars(temp_vars, self.play_vars)
temp_vars = utils.combine_vars(temp_vars, self.play_file_vars)
temp_vars = utils.combine_vars(temp_vars, self.extra_vars)
temp_vars = utils.combine_vars(temp_vars, {'groups': inject['groups']})
hostvars = HostVars(temp_vars, self.inventory, vault_password=self.vault_pass)