56 changes to include_tasks

roles/network/tasks/detected_network.yml

@@ -27,7 +27,7 @@
   when: discovered_wan_iface != "none"
 
 - name: RedHat network detection
-  include: detected_redhat.yml
+  include_tasks: detected_redhat.yml
   when: is_redhat
 
 # WIRELESS -- if any wireless is detected as gateway, it becomes WAN

roles/network/tasks/ifcfg_mods.yml

@@ -31,17 +31,17 @@
   when: (num_lan_interfaces != "0" or iiab_wireless_lan_iface != "none")
 
 ## vars/ users should set user_wan_iface to avoid messy redetect
-- include: redetect.yml
+- include_tasks: redetect.yml
   when: discovered_wan_iface == "none" and user_wan_iface == "auto"
 
 # move gateway if not WAN
 # might have wifi info if wireless is used as uplink.
-- include: edit_ifcfg.yml
+- include_tasks: edit_ifcfg.yml
   when: has_wifi_gw == "none" and has_ifcfg_gw != "none" and has_ifcfg_gw != "/etc/sysconfig/network-scripts/ifcfg-WAN"
 
 # create ifcfg-WAN if missing
 # if we get here we have gateway but no ifcfg file
-- include: create_ifcfg.yml
+- include_tasks: create_ifcfg.yml
   when: iiab_wan_iface != "none" and not has_WAN and has_ifcfg_gw == "none" and xo_model == "none" and not iiab_demo_mode
 
 - name: Configuring LAN interface as iiab_lan_iface
@@ -64,7 +64,7 @@
   tags:
     - network
 
-- include: enable_wan.yml
+- include_tasks: enable_wan.yml
   when: not installing and not iiab_demo_mode
 
 # monitor-connection-files defaults to no with F21, F18-F20 defaults to yes

roles/network/tasks/main.yml

@@ -1,10 +1,10 @@
-- include: detected_network.yml
+- include_tasks: detected_network.yml
   when: not installing
   tags:
     - network
     - network-discover
 
-- include: computed_network.yml
+- include_tasks: computed_network.yml
   when: not installing
   tags:
     - network
@@ -42,41 +42,41 @@
 
 
 ##### Start static ip address info for first run #####
-#- include: static.yml
+#- include_tasks: static.yml
 #  when: 'iiab_wan_iface != "none" and wan_ip != "dhcp"'
 ##### End static ip address info
 
-- include: hosts.yml
+- include_tasks: hosts.yml
   tags:
     - network
 
-- include: named.yml
+- include_tasks: named.yml
   tags:
     - named
     - network
 
-- include: dhcpd.yml
+- include_tasks: dhcpd.yml
   tags:
     - dhcpd
     - network
 
-- include: squid.yml
+- include_tasks: squid.yml
   tags:
     - squid
     - network
   when: squid_install
 
-- include: wondershaper.yml
+- include_tasks: wondershaper.yml
   tags:
     - wondershaper
     - network
 
-- include: iptables.yml
+- include_tasks: iptables.yml
   tags:
     - iptables
     - network
 
-- include: avahi.yml
+- include_tasks: avahi.yml
   tags:
     - network
 
@@ -84,17 +84,17 @@
   shell: systemctl daemon-reload
   when: not installing
 
-- include: ifcfg_mods.yml
+- include_tasks: ifcfg_mods.yml
   tags:
     - network
   when: is_redhat and not installing
 
-- include: debian.yml
+- include_tasks: debian.yml
   tags:
     - network
   when: is_debuntu and not is_rpi  and not installing
 
-- include: rpi_debian.yml
+- include_tasks: rpi_debian.yml
   tags:
     - network
   when: is_debuntu and is_rpi  and not installing
@@ -110,20 +110,20 @@
   tags:
     - network
 
-- include: computed_services.yml
+- include_tasks: computed_services.yml
   tags:
     - network
 
-- include: enable_services.yml
+- include_tasks: enable_services.yml
   tags:
     - network
 
-- include: restart.yml
+- include_tasks: restart.yml
   when: not installing
   tags:
     - network
 
-- include: hostapd.yml
+- include_tasks: hostapd.yml
   when: not installing
   tags:
     - network

roles/network/tasks/squid.yml

@@ -64,7 +64,7 @@
         mode=0750
         state=directory
 
-- include: dansguardian.yml
+- include_tasks: dansguardian.yml
   when: dansguardian_install
 
 - name: Stop Squid

roles/network/tasks/static.yml

@@ -4,7 +4,7 @@
   template: src=network/ifcfg-WAN.j2
             dest=/etc/sysconfig/network-scripts/ifcfg-WAN
 
-- include: NM.yml
+- include_tasks: NM.yml
   when: 'ansible_distribution_version <= "20" and wan_ip != "dhcp"'
 
 - name: Re-read network config files