fixed network management

Author: arBmind

handlers/main.yml

@@ -1,5 +1,5 @@
 ---
 - name: restart
   service:
-    name: {{ network_service }}
+    name: "{{ network_service }}"
     state: restarted

tasks/main.yml

@@ -3,40 +3,53 @@
   file:
     path: "{{ network_interface_path }}"
     state: directory
-  when: network_interfaces | length > 0
+  when: network_interfaces
 
 - name: all interfaces
   template:
     src: all_interfaces.j2
     dest: "{{ network_all_interfaces_path }}"
   notify: restart
-  when: network_interfaces | length > 0
+  when: network_interfaces
 
 - name: list network interfaces
-  command: "find {{ network_interface_path }} -name 'device-*'"
+  command: "find {{ network_interface_path }} -type f"
   changed_when: no
+  when: network_interfaces
   register: network_existing_files
 
 - name: configurations
   template:
     src: device.j2
-    dest: "{{ network_interface_path }}/device-{{ item.device }}-{{ item.family }}"
+    dest: "{{ network_interface_path }}/device-{{ item.device }}-{{ item.family | default('inet') }}"
   with_items: network_interfaces
   register: network_configuration_result
 
+- name: configured files
+  set_fact:
+    network_configured_files: >
+      [{% for item in network_configuration_result.results | default([]) -%}
+        u"{{ item.dest | default(item.path) }}"
+        {{ '' if loop.last else ',' }}
+      {%- endfor %}]
+
 - name: remove configurations
   file:
     dest: "{{ item }}"
     state: absent
   when: >
-    network_manage_devices and
-    item in (network_configuration_result.results | map(attribute='path'))
-  with_items: network_existing_files
+    network_manage_devices
+    and (item not in network_configured_files)
+  with_items: network_existing_files.stdout_lines | default([])
 
 - name: restart devices
   service:
     name: "{{ network_service }}"
     state: restarted
-    arguments: "{{ item.grouper }}"
-  when: true in (item.list | map(attribute='changed'))
-  with_items: network_configuration_result.results | groupby('item.device')
+    arguments: "INTERFACE={{ item.0 }}"
+  when: >
+    (0 != item.1 | selectattr('changed') | list | length)
+    and ((0 != item.1 | selectattr('item.auto', 'undefined') | list | length)
+      or (true in item.1 | selectattr('item.auto') | list)
+    )
+  with_items: network_configuration_result.results | default([]) | groupby('item.device')

templates/device.j2

@@ -1,37 +1,47 @@
 # {{ ansible_managed }}
-{% if item.auto | default(true, true) -%}
+
+{% if item.auto | default(true) %}
 auto {{ item.device }}
-{% endif -%}
+{% endif %}
 iface {{ item.device }} {{ item.family | default('inet', true) }} {{ item.method | default('dhcp', true) }}
-{% for key in ['address', 'network', 'netmask', 'broadcast', 'gateway'] -%}
-{%   if key in item -%}
+{% for key in ['address', 'network', 'netmask', 'broadcast', 'gateway'] %}
+{%   if key in item %}
   {{ key }} {{ item[key] }}
-{%   endif -%}
-{% endfor -%}
+{%   endif %}
+{% endfor %}
+
+{%- if item.nameservers is defined %}
 
-{% if item.nameservers is defined -%}
   dns-nameservers {{ item.nameservers | join(' ') }}
-{% endif -%}
+{% endif %}
+
+{%- if item.bridge is defined -%}
 
-{% if item.bridge is defined -%}
-{%   for key in ['ports', 'stp', 'fd', 'maxwait'] -%}
+  # bridge settings
+{%   for key in ['ports', 'stp', 'fd', 'maxwait'] %}
 {%     if key in item.bridge -%}
   bridge_{{ key }} {{ item.bridge[key] }}
-{%     endif -%}
-{%   endfor -%}
-{% endif -%}
+{%     endif %}
+{%   endfor %}
+{% endif %}
 
-{% if item.subnets is defined -%}
-{%   for subnet in item.subnets -%}
+{%- if item.subnets is defined %}
+
+  # additional subnets
+{%   for subnet in item.subnets %}
   up /sbin/ip addr add {{ subnet }} dev {{ item.device }}
   down /sbin/ip addr del {{ subnet }} dev {{ item.device }}
-{%   endfor -%}
-{% endif -%}
+{%   endfor %}
+{% endif %}
+
+{%- if ['pre-up', 'up', 'down', 'post-down'] | intersect(item.keys()) %}
 
-{% for key in ['pre-up', 'up', 'down', 'post-down'] -%}
-{%   if key in item -%}
-{%     for value in item[key] -%}
+  # hook scripts
+{%   for key in ['pre-up', 'up', 'down', 'post-down'] %}
+{%     if key in item %}
+{%       for value in item[key] %}
   {{ key }} {{ value }}
-{%     endfor -%}
-{%   endif -%}
-{% endfor -%}
+{%       endfor %}
+{%     endif %}
+{%   endfor %}
+{% endif %}