Fix for accelerate when ansible_ssh_user is specified

This commit is contained in:
bennojoy
2013-09-25 19:24:54 +05:30
parent 776fc044dd
commit 70a9a797fa
2 changed files with 9 additions and 1 deletions

View File

@@ -86,7 +86,10 @@ class Connection(object):
def _execute_accelerate_module(self):
args = "password=%s port=%s" % (base64.b64encode(self.key.__str__()), str(self.accport))
inject = dict(password=self.key)
inject = utils.combine_vars(inject, self.runner.inventory.get_variables(self.host))
if self.runner.accelerate_inventory_host:
inject = utils.combine_vars(inject, self.runner.inventory.get_variables(self.runner.accelerate_inventory_host))
else:
inject = utils.combine_vars(inject, self.runner.inventory.get_variables(self.host))
self.ssh.connect()
tmp_path = self.runner._make_tmp_path(self.ssh)
return self.runner._execute_module(self.ssh, tmp_path, 'accelerate', args, inject=inject)