ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix for accelerate when ansible_ssh_user is specified

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -571,6 +571,11 @@ class Runner(object):
actual_private_key_file = inject.get('ansible_ssh_private_key_file', self.private_key_file) actual_private_key_file = inject.get('ansible_ssh_private_key_file', self.private_key_file)
if self.accelerate and actual_transport != 'local': if self.accelerate and actual_transport != 'local':
#Fix to get the inventory name of the host to accelerate plugin
if inject.get('ansible_ssh_host', None):
self.accelerate_inventory_host = host
else:
self.accelerate_inventory_host = None
# if we're using accelerated mode, force the # if we're using accelerated mode, force the
# transport to accelerate # transport to accelerate
actual_transport = "accelerate" actual_transport = "accelerate"

3
lib/ansible/runner/connection_plugins/accelerate.py
View file

@ -86,6 +86,9 @@ class Connection(object):
def _execute_accelerate_module(self): def _execute_accelerate_module(self):
args = "password=%s port=%s" % (base64.b64encode(self.key.__str__()), str(self.accport)) args = "password=%s port=%s" % (base64.b64encode(self.key.__str__()), str(self.accport))
inject = dict(password=self.key) inject = dict(password=self.key)
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)) inject = utils.combine_vars(inject, self.runner.inventory.get_variables(self.host))
self.ssh.connect() self.ssh.connect()
tmp_path = self.runner._make_tmp_path(self.ssh) tmp_path = self.runner._make_tmp_path(self.ssh)