Catching up config with known state

roles/ShadowArch/tasks/archlinux-network.yml

@@ -9,35 +9,35 @@
 
   - name: Static ArchLinux network config
     become: yes
-    when: static and not tap
+    when: static is defined and not tap is defined
     template:
         src: netctl-static.j2
         dest: "/etc/netctl/{{ ipinterface }}"
 
   - name: Tap ArchLinux network config
     become: yes
-    when: tap and not static
+    when: tap is defined and not static is defined
     template:
-        src: netctl-tap.j2
+        src: netctl-tap is defined.j2
         dest: "/etc/netctl/{{ ipinterface }}"
 
   - name: Bridge ArchLinux network config
     become: yes
-    when: tap and not static
+    when: tap is defined and not static is defined
     template:
         src: netctl-bond.j2
         dest: "/etc/netctl/br0"
 
   - name: Tunnel ArchLinux network config
     become: yes
-    when: tap and not static
+    when: tap is defined and not static is defined
     copy:
         src: netctl-tun
         dest: "/etc/netctl/tun0"
 
   - name: Dynamic ArchLinux network config
     become: yes
-    when: not static and not tap
+    when: not static is defined and not tap is defined
     template:
         src: netctl-dhcp.j2
         dest: "/etc/netctl/{{ ipinterface }}"