diff --git a/README.md b/README.md index 0050f0f..e59ca76 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ None #### Variables -* `ant_version` [default: `1.10.9`]: Version to install +* `ant_version` [default: `1.10.10`]: Version to install * `ant_install_prefix` [default: `/opt`]: Install prefix ## Dependencies diff --git a/defaults/main.yml b/defaults/main.yml index 55f7c00..5e6beab 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,4 +1,4 @@ # defaults file --- -ant_version: 1.10.9 +ant_version: 1.10.10 ant_install_prefix: /opt diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index be762b2..73043c4 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -2,5 +2,8 @@ - name: Converge hosts: all become: true + pre_tasks: + - name: include vars + include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml" roles: - ../../../ diff --git a/tests/test.yml b/tests/test.yml index 70ad457..c2fbb9f 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -4,7 +4,7 @@ connection: local become: true pre_tasks: - - name: include tasks - include: "{{ playbook_dir }}/tasks/pre.yml" + - name: include vars + include_vars: "{{ playbook_dir }}/vars/main.yml" roles: - ../../ diff --git a/tests/vagrant.yml b/tests/vagrant.yml index fed2ce2..3808922 100644 --- a/tests/vagrant.yml +++ b/tests/vagrant.yml @@ -4,7 +4,7 @@ remote_user: vagrant become: true pre_tasks: - - name: include tasks - include: "{{ playbook_dir }}/tasks/pre.yml" + - name: include vars + include_vars: "{{ playbook_dir }}/vars/main.yml" roles: - ../../ diff --git a/tests/vars/main.yml b/tests/vars/main.yml new file mode 100644 index 0000000..c552aca --- /dev/null +++ b/tests/vars/main.yml @@ -0,0 +1,3 @@ +# vars file +--- +ant_version: 1.9.15