From a67cc85bdb1495ac3eb102ac4fb168ccf6ff7881 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Sun, 27 Jan 2019 04:44:24 +0000 Subject: [PATCH] issue #477: use MITOGEN_INVENTORY_FILE everywhere. --- .../integration/runner/missing_module.yml | 2 +- tests/ansible/integration/ssh/timeouts.yml | 2 +- tests/ansible/integration/ssh/variables.yml | 16 ++++++++-------- .../strategy/mixed_vanilla_mitogen.yml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/ansible/integration/runner/missing_module.yml b/tests/ansible/integration/runner/missing_module.yml index 064a9bf8..205c8632 100644 --- a/tests/ansible/integration/runner/missing_module.yml +++ b/tests/ansible/integration/runner/missing_module.yml @@ -6,7 +6,7 @@ - connection: local command: | ansible -vvv - -i "{{inventory_file}}" + -i "{{MITOGEN_INVENTORY_FILE}}" test-targets -m missing_module args: diff --git a/tests/ansible/integration/ssh/timeouts.yml b/tests/ansible/integration/ssh/timeouts.yml index 0fd416f5..92fd9307 100644 --- a/tests/ansible/integration/ssh/timeouts.yml +++ b/tests/ansible/integration/ssh/timeouts.yml @@ -6,7 +6,7 @@ - connection: local command: | ansible -vvv - -i "{{inventory_file}}" + -i "{{MITOGEN_INVENTORY_FILE}}" test-targets -m custom_python_detect_environment -e ansible_user=mitogen__slow_user -e ansible_password=slow_user_password diff --git a/tests/ansible/integration/ssh/variables.yml b/tests/ansible/integration/ssh/variables.yml index 6bfcb2a5..71536391 100644 --- a/tests/ansible/integration/ssh/variables.yml +++ b/tests/ansible/integration/ssh/variables.yml @@ -18,7 +18,7 @@ shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{inventory_file}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets -e ansible_ssh_user=mitogen__has_sudo -e ansible_ssh_pass=has_sudo_password args: @@ -29,7 +29,7 @@ - shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{inventory_file}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets -e ansible_ssh_user=mitogen__has_sudo -e ansible_ssh_pass=wrong_password args: @@ -47,7 +47,7 @@ shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{inventory_file}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets -e ansible_user=mitogen__has_sudo -e ansible_ssh_pass=has_sudo_password args: @@ -58,7 +58,7 @@ - shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{inventory_file}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets -e ansible_user=mitogen__has_sudo -e ansible_ssh_pass=wrong_password args: @@ -76,7 +76,7 @@ shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{inventory_file}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets -e ansible_user=mitogen__has_sudo -e ansible_password=has_sudo_password args: @@ -87,7 +87,7 @@ - shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{inventory_file}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets -e ansible_user=mitogen__has_sudo -e ansible_password=wrong_password args: @@ -110,7 +110,7 @@ shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{inventory_file}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets -e ansible_user=mitogen__has_sudo_pubkey -e ansible_ssh_private_key_file=../data/docker/mitogen__has_sudo_pubkey.key args: @@ -121,7 +121,7 @@ - shell: > ANSIBLE_STRATEGY=mitogen_linear ANSIBLE_SSH_ARGS="" - ansible -m shell -a whoami -i "{{inventory_file}}" test-targets + ansible -m shell -a whoami -i "{{MITOGEN_INVENTORY_FILE}}" test-targets -e ansible_user=mitogen__has_sudo -e ansible_ssh_private_key_file=/dev/null args: diff --git a/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml b/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml index a7aadb19..206f80bd 100644 --- a/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml +++ b/tests/ansible/integration/strategy/mixed_vanilla_mitogen.yml @@ -6,7 +6,7 @@ - connection: local command: | ansible-playbook - -i "{{inventory_file}}" + -i "{{MITOGEN_INVENTORY_FILE}}" -vvv integration/strategy/_mixed_mitogen_vanilla.yml args: @@ -16,7 +16,7 @@ - connection: local command: | ansible-playbook - -i "{{inventory_file}}" + -i "{{MITOGEN_INVENTORY_FILE}}" -vvv integration/strategy/_mixed_vanilla_mitogen.yml args: