From 4b351ebfec2221a84cc5eaeb7f1c292999bc372c Mon Sep 17 00:00:00 2001 From: Cory Hawkless Date: Mon, 27 Jun 2022 22:52:24 +0930 Subject: [PATCH 1/3] Enable custom bond mode --- templates/interfaces.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/interfaces.j2 b/templates/interfaces.j2 index c67890a..0d84183 100644 --- a/templates/interfaces.j2 +++ b/templates/interfaces.j2 @@ -95,7 +95,11 @@ auto {{ item['name'] }} {% if item['mtu'] is defined %} mtu {{ item['mtu'] }} {% endif %} - bond-mode active-backup +{% if item['bond-mode'] is defined %} + bond-mode {{ item['bond-mode'] }} +{% else %} + bond-mode active-backup +{% endif %} bond-miimon 100 bond-slaves none {% if item['routes'] is defined %} From 6acbb03400911498f83f971cc61a7c9fd66f4afa Mon Sep 17 00:00:00 2001 From: Cory Hawkless Date: Wed, 29 Jun 2022 22:47:26 +0930 Subject: [PATCH 2/3] wildcard netplan config delete --- tasks/main.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index a11eb92..61ed733 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -19,23 +19,23 @@ state: absent tags: interfaces -- name: Remove /etc/netplan/01-netcfg.yaml - file: - path: /etc/netplan/01-netcfg.yaml - state: absent - tags: interfaces +- name: Get directory stats + stat: + path: "/etc/netplan" + register: directory_stat -- name: Remove /etc/netplan/50-cloud-init.yaml +- name: Delete directory file: - path: /etc/netplan/50-cloud-init.yaml + path: "/etc/netplan" state: absent - tags: interfaces -- name: Remove /etc/netplan/00-installer-config.yaml +- name: Create directory file: - path: /etc/netplan/00-installer-config.yaml - state: absent - tags: interfaces + path: "/etc/netplan" + state: directory + owner: "{{ directory_stat.stat.pw_name }}" + group: "{{ directory_stat.stat.gr_name }}" + mode: "{{ directory_stat.stat.mode }}" - name: Add the bonding module modprobe: From 2b3fee17791fa60ea4ccc51a82f208c8a07ae839 Mon Sep 17 00:00:00 2001 From: Cory Hawkless Date: Fri, 2 Dec 2022 16:41:08 +1030 Subject: [PATCH 3/3] Changed delete logic --- tasks/main.yml | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 61ed733..3f024c3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -19,24 +19,39 @@ state: absent tags: interfaces -- name: Get directory stats - stat: - path: "/etc/netplan" - register: directory_stat +# - name: Get directory stats +# stat: +# path: "/etc/netplan" +# register: directory_stat -- name: Delete directory +# - name: Delete directory +# file: +# path: "/etc/netplan" +# state: absent + +# - name: Create directory +# file: +# path: "/etc/netplan" +# state: directory +# owner: "{{ directory_stat.stat.pw_name }}" +# group: "{{ directory_stat.stat.gr_name }}" +# mode: "{{ directory_stat.stat.mode }}" +- name: 'Collect files in netplan dir' + find: + paths: "/etc/netplan/" + hidden: True + recurse: True + # file_type: any # Added in ansible 2.3 + register: collected_files + tags: interfaces + +- name: Remove collected files file: - path: "/etc/netplan" + path: "{{ item.path }}" state: absent - -- name: Create directory - file: - path: "/etc/netplan" - state: directory - owner: "{{ directory_stat.stat.pw_name }}" - group: "{{ directory_stat.stat.gr_name }}" - mode: "{{ directory_stat.stat.mode }}" - + with_items: "{{ collected_files.files }}" + tags: interfaces + - name: Add the bonding module modprobe: name: bonding