feat: Consolidate all in interfaces (Debian)

jbe-dw · Oct 6, 2022 · eaf758b · eaf758b
1 parent ecf8c21
commit eaf758b
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -38,6 +38,10 @@ interfaces_setup_filter: "{{ omit }}"
 
 # An optional gather_subset parameter to pass to the setup module.
 interfaces_setup_gather_subset: "{{ omit }}"
+
+# An option to merge all configurations setup with merge: true
+# in the global interfaces file (Debian-Family only)
+interfaces_merge: false
 ```
 
 Note: The values for the list are listed in the examples below.

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -35,3 +35,4 @@ interfaces_pause_time: 0
 interfaces_setup_filter: "{{ omit }}"
 interfaces_setup_gather_subset: "{{ omit }}"
 interfaces_bond_setup_slaves: true
+interfaces_merge: false
diff --git a/tasks/debian.yml b/tasks/debian.yml
@@ -41,10 +41,22 @@
     group: root
     mode: 0644
   tags: configuration
+  when: not interfaces_merge
 
 - name: Debian | Create the directory for interface cfg files
   become: true
   file:
     path: '{{ interfaces_net_path[ansible_facts.os_family|lower] }}'
     state: directory
   tags: configuration
+
+- name: Debian | Ensure lo single configuration file
+  copy:
+    dest: /etc/network/interfaces.d/ifcfg-lo
+    mode: 0644
+    content: |
+      # Loopback
+
+      auto lo
+      iface lo inet loopback
+  when: interfaces_merge
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -17,5 +17,14 @@
   when: interfaces_ether_interfaces is defined
   tags: configuration
 
+- name: Debian | Merge configuration in interface file
+  assemble:
+    src: "{{ interfaces_net_path['debian'] }}"
+    dest: /etc/network/interfaces
+  tags: configuration
+  when:
+    - ansible_facts.os_family | lower == 'debian'
+    - interfaces_merge
+
 - import_tasks: 'service.yml'
   tags: service
diff --git a/templates/bond_Debian.j2 b/templates/bond_Debian.j2
@@ -1,4 +1,6 @@
-# {{ ansible_managed }}
+{% if not interfaces_merge %}# {{ ansible_managed }}
+{% else %}# Bond - {{ item.device }}
+{% endif %}
 
 auto {{ item.device }}
 {% if item.bootproto == 'manual' %}
@@ -57,7 +59,7 @@ bond-slaves none
 bond-slaves {{ item.bond_slaves|join(' ') }}
 {% endif %}
 
-{% if item.route is defined %}
+{%- if item.route is defined %}
 {% for i in item.route %}
 {# Workaround for Ansible bug https://github.com/ansible/ansible/issues/17872. #}
 {% set prefix = ('0.0.0.0/' ~ i.netmask) | ipaddr('prefix') %}
@@ -78,7 +80,7 @@ down ip route del {{ route }}
 {% endfor %}
 {% endif %}
 
-{% if item.rules is defined %}
+{%- if item.rules is defined %}
 {% for rule in item.rules %}
 up ip rule add {{ rule }}
 down ip rule del {{ rule }}

diff --git a/templates/bond_slave_Debian.j2 b/templates/bond_slave_Debian.j2
@@ -1,5 +1,9 @@
-# {{ ansible_managed }}
+{% if not interfaces_merge %}# {{ ansible_managed }}
+{% else %}# Bond Slave - {{ item.0.device }}/{{ item.1 }}
+{% endif %}
 
 auto {{ item.1 }}
 iface {{ item.1 }} inet manual
+{% if ansible_facts.distribution_major_version | int < 11 %}
 bond-master {{ item.0.device }}
+{% endif %}
diff --git a/templates/bridge_Debian.j2 b/templates/bridge_Debian.j2
@@ -1,4 +1,6 @@
-# {{ ansible_managed }}
+{% if not interfaces_merge %}# {{ ansible_managed }}
+{% else %}# Bridge - {{ item.device }}
+{% endif %}
 
 auto {{ item.device }}
 {% if item.bootproto == 'dhcp' %}
@@ -39,7 +41,7 @@ bridge_fd {{ item.fd }}
 bridge-vlan-aware {{ item.vlan_aware }}
 {% endif %}
 
-{% if item.route is defined %}
+{%- if item.route is defined %}
 {% for i in item.route %}
 {# Workaround for Ansible bug https://github.com/ansible/ansible/issues/17872. #}
 {% set prefix = ('0.0.0.0/' ~ i.netmask) | ipaddr('prefix') %}
@@ -60,7 +62,7 @@ down ip route del {{ route }}
 {% endfor %}
 {% endif %}
 
-{% if item.rules is defined %}
+{%- if item.rules is defined %}
 {% for rule in item.rules %}
 up ip rule add {{ rule }}
 down ip rule del {{ rule }}

diff --git a/templates/bridge_port_Debian.j2 b/templates/bridge_port_Debian.j2
@@ -1,4 +1,6 @@
-# {{ ansible_managed }}
+{% if not interfaces_merge %}# {{ ansible_managed }}
+{% else %}# Bridge Port - {{ item.0.device }}/{{ item.1 }}
+{% endif %}
 
 auto {{ item.1 }}
 iface {{ item.1 }}  inet manual

diff --git a/templates/ethernet_Debian.j2 b/templates/ethernet_Debian.j2
@@ -1,4 +1,6 @@
-# {{ ansible_managed }}
+{% if not interfaces_merge %}# {{ ansible_managed }}
+{% else %}# Ethernet - {{ item.device }}
+{% endif %}
 
 {{ item.allowclass | default('auto') }} {{ item.device }}
 {% if item.bootproto == 'dhcp' %}