ansible: fix become:true with sudo:true

This commit is contained in:
David Wilson 2018-02-27 15:41:16 +05:45
parent 83f2862431
commit 1b090a6c0a
2 changed files with 7 additions and 4 deletions

View File

@ -28,6 +28,7 @@
from __future__ import absolute_import
import logging
import os
import sys
import time
import ansible.errors
@ -105,7 +106,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
})
)
def _connect_sudo(self, via):
def _connect_sudo(self, via=None, python_path=None):
"""
Fetch a reference to a sudo Context matching the play context from
ContextService in the master process.
@ -118,7 +119,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
'method': 'sudo',
'username': self._play_context.become_user,
'password': self._play_context.password,
'python_path': '/usr/bin/python',
'python_path': python_path or '/usr/bin/python',
'via': via,
}))
@ -140,7 +141,10 @@ class Connection(ansible.plugins.connection.ConnectionBase):
self.router, self.parent = mitogen.unix.connect(path)
if self.original_transport == 'local':
self.context = self._connect_local()
if not self._play_context.become:
self.context = self._connect_local()
else:
self.context = self._connect_sudo(python_path=sys.executable)
else:
self.host = self._connect_ssh()
if not self._play_context.become:

View File

@ -1,7 +1,6 @@
[defaults]
inventory = hosts
strategy_plugins = ../../ansible_mitogen/strategy
strategy = mitogen
retry_files_enabled = False
[ssh_connection]