diff options
14 files changed, 24 insertions, 10 deletions
diff --git a/test/integration/targets/any_errors_fatal/inventory b/test/integration/targets/any_errors_fatal/inventory index 470333e7ba..3ae8d9c305 100644 --- a/test/integration/targets/any_errors_fatal/inventory +++ b/test/integration/targets/any_errors_fatal/inventory @@ -1,3 +1,6 @@ [local] testhost ansible_connection=local host_var_role_name=role3 testhost2 ansible_connection=local host_var_role_name=role2 + +[local:vars] +ansible_python_interpreter="{{ ansible_playbook_python }}" diff --git a/test/integration/targets/callback_default/inventory b/test/integration/targets/callback_default/inventory index 25fcc295ec..e75c585dc0 100644 --- a/test/integration/targets/callback_default/inventory +++ b/test/integration/targets/callback_default/inventory @@ -1,5 +1,5 @@ [local] -testhost ansible_connection=local +testhost ansible_connection=local ansible_python_interpreter="{{ ansible_playbook_python }}" [nonexistent] -testhost5 ansible_host=169.254.199.200 +testhost5 ansible_host=169.254.199.200 # no connection is ever established with this host diff --git a/test/integration/targets/connection_chroot/test_connection.inventory b/test/integration/targets/connection_chroot/test_connection.inventory index 9e0302c7d0..5f78393f21 100644 --- a/test/integration/targets/connection_chroot/test_connection.inventory +++ b/test/integration/targets/connection_chroot/test_connection.inventory @@ -4,3 +4,4 @@ chroot-no-pipelining ansible_ssh_pipelining=false [chroot:vars] ansible_host=/ ansible_connection=chroot +ansible_python_interpreter="{{ ansible_playbook_python }}" diff --git a/test/integration/targets/connection_local/test_connection.inventory b/test/integration/targets/connection_local/test_connection.inventory index 7178291040..64a2722745 100644 --- a/test/integration/targets/connection_local/test_connection.inventory +++ b/test/integration/targets/connection_local/test_connection.inventory @@ -4,3 +4,4 @@ local-no-pipelining ansible_ssh_pipelining=false [local:vars] ansible_host=localhost ansible_connection=local +ansible_python_interpreter="{{ ansible_playbook_python }}" diff --git a/test/integration/targets/connection_paramiko_ssh/test_connection.inventory b/test/integration/targets/connection_paramiko_ssh/test_connection.inventory index 8c430f0d0f..a3f34ab70f 100644 --- a/test/integration/targets/connection_paramiko_ssh/test_connection.inventory +++ b/test/integration/targets/connection_paramiko_ssh/test_connection.inventory @@ -4,3 +4,4 @@ paramiko_ssh-no-pipelining ansible_ssh_pipelining=false [paramiko_ssh:vars] ansible_host=localhost ansible_connection=paramiko_ssh +ansible_python_interpreter="{{ ansible_playbook_python }}" diff --git a/test/integration/targets/connection_ssh/test_connection.inventory b/test/integration/targets/connection_ssh/test_connection.inventory index 0f0ad23ebb..a1a4ff1e49 100644 --- a/test/integration/targets/connection_ssh/test_connection.inventory +++ b/test/integration/targets/connection_ssh/test_connection.inventory @@ -4,3 +4,4 @@ ssh-no-pipelining ansible_ssh_pipelining=false [ssh:vars] ansible_host=localhost ansible_connection=ssh +ansible_python_interpreter="{{ ansible_playbook_python }}" diff --git a/test/integration/targets/delegate_to/inventory b/test/integration/targets/delegate_to/inventory index dfd3a95372..8bf94347aa 100644 --- a/test/integration/targets/delegate_to/inventory +++ b/test/integration/targets/delegate_to/inventory @@ -3,3 +3,6 @@ testhost ansible_connection=local testhost2 ansible_connection=local testhost3 ansible_ssh_host=127.0.0.3 testhost4 ansible_ssh_host=127.0.0.4 + +[local:vars] +ansible_python_interpreter="{{ ansible_playbook_python }}" diff --git a/test/integration/targets/delegate_to/test_delegate_to_loop_randomness.yml b/test/integration/targets/delegate_to/test_delegate_to_loop_randomness.yml index 4513228614..81033a16a0 100644 --- a/test/integration/targets/delegate_to/test_delegate_to_loop_randomness.yml +++ b/test/integration/targets/delegate_to/test_delegate_to_loop_randomness.yml @@ -8,6 +8,7 @@ name: "foo{{item}}" groups: foo ansible_connection: local + ansible_python_interpreter: "{{ ansible_playbook_python }}" loop: "{{ range(10)|list }}" # We expect all of the next 3 runs to succeeed diff --git a/test/integration/targets/gathering_facts/inventory b/test/integration/targets/gathering_facts/inventory index 8c6c24a379..e15ae780f0 100644 --- a/test/integration/targets/gathering_facts/inventory +++ b/test/integration/targets/gathering_facts/inventory @@ -1,2 +1,2 @@ [local] -facthost[0:25] ansible_connection=local +facthost[0:25] ansible_connection=local ansible_python_interpreter="{{ ansible_playbook_python }}" diff --git a/test/integration/targets/hosts_field/inventory.hosts_field b/test/integration/targets/hosts_field/inventory.hosts_field index 81efd478f8..4664404626 100644 --- a/test/integration/targets/hosts_field/inventory.hosts_field +++ b/test/integration/targets/hosts_field/inventory.hosts_field @@ -1 +1 @@ -42 ansible_host=127.0.0.42 ansible_connection=local +42 ansible_host=127.0.0.42 ansible_connection=local ansible_python_interpreter="{{ ansible_playbook_python }}" diff --git a/test/integration/targets/include_import/inventory b/test/integration/targets/include_import/inventory index 470333e7ba..3ae8d9c305 100644 --- a/test/integration/targets/include_import/inventory +++ b/test/integration/targets/include_import/inventory @@ -1,3 +1,6 @@ [local] testhost ansible_connection=local host_var_role_name=role3 testhost2 ansible_connection=local host_var_role_name=role2 + +[local:vars] +ansible_python_interpreter="{{ ansible_playbook_python }}" diff --git a/test/integration/targets/set_fact/inventory b/test/integration/targets/set_fact/inventory index e1a42d86ea..b0c00d327f 100644 --- a/test/integration/targets/set_fact/inventory +++ b/test/integration/targets/set_fact/inventory @@ -1,3 +1,3 @@ [testgroup] -testhost ansible_connection=local -localhost +testhost ansible_connection=local # no connection is actually established with this host +localhost ansible_connection=local ansible_python_interpreter="{{ ansible_playbook_python }}" diff --git a/test/integration/targets/var_blending/inventory b/test/integration/targets/var_blending/inventory index 542f8ecab3..f0afb18d02 100644 --- a/test/integration/targets/var_blending/inventory +++ b/test/integration/targets/var_blending/inventory @@ -1,6 +1,6 @@ [local] -testhost ansible_connection=local -testhost2 ansible_connection=local +testhost ansible_connection=local ansible_python_interpreter="{{ ansible_playbook_python }}" +testhost2 ansible_connection=local # connections are never made to this host, only host vars are accessed # the following inline declarations are accompanied # by (preferred) group_vars/ and host_vars/ variables diff --git a/test/integration/targets/var_precedence/inventory b/test/integration/targets/var_precedence/inventory index 3fcf28e72c..3b52d041db 100644 --- a/test/integration/targets/var_precedence/inventory +++ b/test/integration/targets/var_precedence/inventory @@ -1,12 +1,12 @@ [local] -testhost ansible_connection=local +testhost ansible_connection=local ansible_python_interpreter="{{ ansible_playbook_python }}" [all:vars] extra_var_override=FROM_INVENTORY inven_var=inventory_var [inven_overridehosts] -invenoverride ansible_connection=local +invenoverride ansible_connection=local ansible_python_interpreter="{{ ansible_playbook_python }}" [inven_overridehosts:vars] foo=foo |