From 207d31b4d04bcc5712298e48e5d18717ca833a26 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Mon, 15 Oct 2018 22:19:17 +0200 Subject: [PATCH] tests: Use vars: with include_tasks Specifying vars as foo=bar does not work anymore with Ansible 2.7. Specify the vars using a dictionary instead. This fixes #89 --- tests/tests_ethernet.yml | 8 ++++++-- tests/tests_helpers-and-asserts.yml | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/tests_ethernet.yml b/tests/tests_ethernet.yml index cb4459f..25f117d 100644 --- a/tests/tests_ethernet.yml +++ b/tests/tests_ethernet.yml @@ -19,7 +19,9 @@ type: "{{ type }}" interface: "{{ interface }}" - include_tasks: tasks/show-interfaces.yml - - include_tasks: tasks/manage-test-interface.yml state=present + - include_tasks: tasks/manage-test-interface.yml + vars: + state: present - include_tasks: tasks/assert-device_present.yml - name: Test static interface up @@ -54,5 +56,7 @@ - name: Remove interfaces hosts: all tasks: - - include_tasks: tasks/manage-test-interface.yml state=absent + - include_tasks: tasks/manage-test-interface.yml + vars: + state: absent - include_tasks: tasks/assert-device_absent.yml diff --git a/tests/tests_helpers-and-asserts.yml b/tests/tests_helpers-and-asserts.yml index 33f3e84..36f02c2 100644 --- a/tests/tests_helpers-and-asserts.yml +++ b/tests/tests_helpers-and-asserts.yml @@ -17,7 +17,10 @@ # FIXME: when: does not seem to work with include_tasks, therefore this cannot be safely tested for now # - name: test tap interfaces -# include_tasks: tasks/create-and-remove-interface.yml type=tap interface=tap1298 +# include_tasks: tasks/create-and-remove-interface.yml +# vars: +# - type: tap +# - interface: tap1298 # when: ansible_distribution_major_version > 6 # # ip tuntap does not exist on RHEL6 # # FIXME: Maybe use some other tool to manage devices, openvpn can do this,