Skip to content

Commit 7d1c295

Browse files
committed
More DRY
1 parent 69828d6 commit 7d1c295

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

molecule/default/verify.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
hosts: all
44
become: true
55
tasks:
6+
- name: include vars
7+
include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
68
- name: include tasks
79
include: "{{ playbook_dir }}/../../tests/tasks/post.yml"

tests/tasks/post.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
- name: test tinyproxy installation
1212
command: >
13-
curl -sL --head https://www.google.com --proxy http://127.0.0.1:3128
13+
curl -sL --head https://www.google.com --proxy http://{{ ansible_lo['ipv4']['address'] }}:{{ tinyproxy_port }}
1414
args:
1515
warn: false
1616
register: _result

tests/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
pre_tasks:
77
- name: include vars
88
include_vars: "{{ playbook_dir }}/vars/main.yml"
9+
- name: include tasks
10+
include: "{{ playbook_dir }}/tasks/pre.yml"
911
roles:
1012
- ../../
1113
post_tasks:

tests/vagrant.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
pre_tasks:
77
- name: include vars
88
include_vars: "{{ playbook_dir }}/vars/main.yml"
9+
- name: include tasks
10+
include: "{{ playbook_dir }}/tasks/pre.yml"
911
roles:
1012
- ../../
1113
post_tasks:

0 commit comments

Comments
 (0)