issue #536: connection_delegation/ tests were erroneously broken

While fixing delegate_to, this un-hardwiring of /usr/bin/python
happened. It was always incorrect.
pull/564/head
David Wilson 6 years ago
parent 0dfcf5560b
commit 1d43e187e8

@ -39,7 +39,7 @@
'identity_file': null, 'identity_file': null,
'password': null, 'password': null,
'port': null, 'port': null,
'python_path': null, 'python_path': ["/usr/bin/python"],
'ssh_args': [ 'ssh_args': [
'-o', '-o',
'UserKnownHostsFile=/dev/null', 'UserKnownHostsFile=/dev/null',
@ -66,7 +66,7 @@
'identity_file': null, 'identity_file': null,
'password': null, 'password': null,
'port': null, 'port': null,
'python_path': null, 'python_path': ["/usr/bin/python"],
'ssh_args': [ 'ssh_args': [
'-o', '-o',
'UserKnownHostsFile=/dev/null', 'UserKnownHostsFile=/dev/null',

@ -15,7 +15,7 @@
right: [ right: [
{ {
'kwargs': { 'kwargs': {
'python_path': null 'python_path': ["{{ansible_playbook_python}}"],
}, },
'method': 'local', 'method': 'local',
}, },
@ -23,7 +23,7 @@
'enable_lru': true, 'enable_lru': true,
'kwargs': { 'kwargs': {
'connect_timeout': 10, 'connect_timeout': 10,
'python_path': null, 'python_path': ["{{ansible_playbook_python}}"],
'password': null, 'password': null,
'username': 'root', 'username': 'root',
'sudo_path': null, 'sudo_path': null,

@ -24,7 +24,7 @@
'lxc_info_path': null, 'lxc_info_path': null,
'lxc_path': null, 'lxc_path': null,
'machinectl_path': null, 'machinectl_path': null,
'python_path': null, 'python_path': ["/usr/bin/python"],
'username': 'ansible-cfg-remote-user', 'username': 'ansible-cfg-remote-user',
}, },
'method': 'setns', 'method': 'setns',

@ -43,7 +43,7 @@
"connect_timeout": 10, "connect_timeout": 10,
"doas_path": null, "doas_path": null,
"password": null, "password": null,
"python_path": null, "python_path": ["/usr/bin/python"],
"username": "normal-user", "username": "normal-user",
}, },
"method": "doas", "method": "doas",
@ -72,7 +72,7 @@
'identity_file': null, 'identity_file': null,
'password': null, 'password': null,
'port': null, 'port': null,
'python_path': null, "python_path": ["/usr/bin/python"],
'ssh_args': [ 'ssh_args': [
'-o', '-o',
'UserKnownHostsFile=/dev/null', 'UserKnownHostsFile=/dev/null',
@ -112,7 +112,7 @@
'identity_file': null, 'identity_file': null,
'password': null, 'password': null,
'port': null, 'port': null,
'python_path': null, "python_path": ["/usr/bin/python"],
'ssh_args': [ 'ssh_args': [
'-o', '-o',
'UserKnownHostsFile=/dev/null', 'UserKnownHostsFile=/dev/null',
@ -147,7 +147,7 @@
'connect_timeout': 10, 'connect_timeout': 10,
'doas_path': null, 'doas_path': null,
'password': null, 'password': null,
'python_path': null, "python_path": ["/usr/bin/python"],
'username': 'normal-user', 'username': 'normal-user',
}, },
'method': 'doas', 'method': 'doas',
@ -162,7 +162,7 @@
'identity_file': null, 'identity_file': null,
'password': null, 'password': null,
'port': null, 'port': null,
'python_path': null, "python_path": ["/usr/bin/python"],
'ssh_args': [ 'ssh_args': [
'-o', '-o',
'UserKnownHostsFile=/dev/null', 'UserKnownHostsFile=/dev/null',
@ -202,7 +202,7 @@
'identity_file': null, 'identity_file': null,
'password': null, 'password': null,
'port': null, 'port': null,
'python_path': null, "python_path": ["/usr/bin/python"],
'ssh_args': [ 'ssh_args': [
'-o', '-o',
'UserKnownHostsFile=/dev/null', 'UserKnownHostsFile=/dev/null',
@ -229,7 +229,7 @@
'identity_file': null, 'identity_file': null,
'password': null, 'password': null,
'port': null, 'port': null,
'python_path': null, "python_path": ["/usr/bin/python"],
'ssh_args': [ 'ssh_args': [
'-o', '-o',
'UserKnownHostsFile=/dev/null', 'UserKnownHostsFile=/dev/null',
@ -264,7 +264,7 @@
'connect_timeout': 10, 'connect_timeout': 10,
'doas_path': null, 'doas_path': null,
'password': null, 'password': null,
'python_path': null, "python_path": ["/usr/bin/python"],
'username': 'normal-user', 'username': 'normal-user',
}, },
'method': 'doas', 'method': 'doas',
@ -279,7 +279,7 @@
'identity_file': null, 'identity_file': null,
'password': null, 'password': null,
'port': null, 'port': null,
'python_path': null, "python_path": ["/usr/bin/python"],
'ssh_args': [ 'ssh_args': [
'-o', '-o',
'UserKnownHostsFile=/dev/null', 'UserKnownHostsFile=/dev/null',
@ -320,7 +320,7 @@
'identity_file': null, 'identity_file': null,
'password': null, 'password': null,
'port': null, 'port': null,
'python_path': null, "python_path": ["/usr/bin/python"],
'ssh_args': [ 'ssh_args': [
'-o', '-o',
'UserKnownHostsFile=/dev/null', 'UserKnownHostsFile=/dev/null',
@ -352,7 +352,7 @@
right: [ right: [
{ {
'kwargs': { 'kwargs': {
'python_path': null "python_path": ["{{ansible_playbook_python}}"],
}, },
'method': 'local', 'method': 'local',
}, },
@ -374,7 +374,7 @@
'connect_timeout': 10, 'connect_timeout': 10,
'doas_path': null, 'doas_path': null,
'password': null, 'password': null,
'python_path': null, 'python_path': ["/usr/bin/python"],
'username': 'normal-user', 'username': 'normal-user',
}, },
'method': 'doas', 'method': 'doas',
@ -384,7 +384,7 @@
'connect_timeout': 10, 'connect_timeout': 10,
'doas_path': null, 'doas_path': null,
'password': null, 'password': null,
'python_path': null, 'python_path': ["/usr/bin/python"],
'username': 'newuser-doas-normal-user', 'username': 'newuser-doas-normal-user',
}, },
'method': 'doas', 'method': 'doas',

Loading…
Cancel
Save