More DRY

Dockerfile

@@ -11,7 +11,7 @@ RUN rm -rf $HOME/.cache
 # ansible
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc libffi-dev libssl-dev net-tools iproute2 ethtool && \
   apt-get clean
-RUN pip install ansible==2.9.14
+RUN pip install ansible==2.9.15
 RUN rm -rf $HOME/.cache
 
 # provision

Vagrantfile

@@ -61,11 +61,6 @@ Vagrant.configure("2") do |config|
 
       vms.vm.network :private_network, ip: box[:ip]
 
-      # TODO: Cleanup
-      vms.vm.provision :shell do |shell|
-        shell.path = "tests/vagrant.sh"
-      end
-
       vms.vm.provision :ansible do |ansible|
         ansible.playbook = "tests/vagrant.yml"
         ansible.verbose = "vv"

molecule/default/converge.yml

@@ -2,8 +2,8 @@
 - name: Converge
   hosts: all
   become: true
+  pre_tasks:
+    - name: include vars
+      include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
   roles:
     - ../../../
-  vars:
-    snmpd_agent_address:
-      - "udp:{{ ansible_lo['ipv4']['address'] }}:10161"

molecule/default/prepare.yml

@@ -2,16 +2,8 @@
 - name: Prepare
   hosts: all
   become: true
-  tasks:
-    - name: Enable non-free
-      apt_repository:
-        repo: "{{ item.type }} {{ item.url }} {{ item.component }}"
-        filename: non-free
-      with_items:
-        - type: deb
-          url: "http://ftp.nl.debian.org/debian/ {{ ansible_distribution_release }}"
-          component: contrib non-free
-        - type: deb-src
-          url: "http://ftp.nl.debian.org/debian/ {{ ansible_distribution_release }}"
-          component: contrib non-free
-      when: ansible_distribution == 'Debian'
+  pre_tasks:
+    - name: include vars
+      include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
+    - name: include tasks
+      include: "{{ playbook_dir }}/../../tests/tasks/pre.yml"

tests/tasks/pre.yml

@@ -0,0 +1,14 @@
+# pre test file for snmpd
+---
+- name: enable non-free
+  apt_repository:
+    repo: "{{ item.type }} {{ item.url }} {{ item.component }}"
+    filename: non-free
+  with_items:
+    - type: deb
+      url: "http://ftp.nl.debian.org/debian/ {{ ansible_distribution_release }}"
+      component: contrib non-free
+    - type: deb-src
+      url: "http://ftp.nl.debian.org/debian/ {{ ansible_distribution_release }}"
+      component: contrib non-free
+  when: ansible_distribution == 'Debian'

tests/test.yml

@@ -3,8 +3,10 @@
 - hosts: localhost
   connection: local
   become: true
+  pre_tasks:
+    - name: include vars
+      include_vars: "{{ playbook_dir }}/vars/main.yml"
+    - name: include tasks
+      include: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../
-  vars:
-    snmpd_agent_address:
-      - "udp:{{ ansible_lo['ipv4']['address'] }}:10161"

tests/vagrant.yml

@@ -3,5 +3,8 @@
 - hosts: all
   remote_user: vagrant
   become: true
+  pre_tasks:
+    - name: include tasks
+      include: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../

tests/vars/main.yml

@@ -0,0 +1,4 @@
+# vars file for snmpd
+---
+snmpd_agent_address:
+  - "udp:{{ ansible_lo['ipv4']['address'] }}:10161"