diff --git a/tasks/main.yml b/tasks/main.yml index 5986cbc8169925c3b160d2575fb86f1dab7d3f28..5157bf69758dd8d35b7af96db9fbf35d0b0396c6 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,10 +1,6 @@ --- # Dependent roles will be installed first -- name: Update netplan config - include_tasks: netplan.yaml - when: netplan is defined - - name: Setup nftables include_tasks: nftables.yaml when: nftables is defined diff --git a/tasks/netplan.yaml b/tasks/netplan.yaml deleted file mode 100644 index a0a6294b5270cd693a4b82d6cdf97027e0f12237..0000000000000000000000000000000000000000 --- a/tasks/netplan.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- name: Disable cloud init networking - template: - src: etc/cloud/cloud.cfg.d/99-disable-network-config.cfg.j2 - dest: /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg - mode: 0644 - -- name: Add netplan network config - template: - src: etc/netplan/01-netcfg.yaml.j2 - dest: /etc/netplan/01-netcfg.yaml - mode: 0644 - register: netplan_config - -- name: Remove old netplan config - ansible.builtin.file: - path: /etc/netplan/50-cloud-init.yaml - state: absent - when: netplan_config.changed - -- name: Apply Netplan Configuration - command: netplan apply - when: netplan_config.changed \ No newline at end of file diff --git a/templates/etc/cloud/cloud.cfg.d/99-disable-network-config.cfg.j2 b/templates/etc/cloud/cloud.cfg.d/99-disable-network-config.cfg.j2 deleted file mode 100644 index c12ad7873d81d28f981ea4ee75ee56ac8534c9fa..0000000000000000000000000000000000000000 --- a/templates/etc/cloud/cloud.cfg.d/99-disable-network-config.cfg.j2 +++ /dev/null @@ -1,7 +0,0 @@ -# -# !!! -# {{ ansible_managed }} -# !!! - -# Disable cloudinit network config -network: {config: disabled} diff --git a/templates/etc/netplan/01-netcfg.yaml.j2 b/templates/etc/netplan/01-netcfg.yaml.j2 deleted file mode 100644 index 8cd0c6fc27b86cbe37b4a1b3985bcf7cc306c289..0000000000000000000000000000000000000000 --- a/templates/etc/netplan/01-netcfg.yaml.j2 +++ /dev/null @@ -1,10 +0,0 @@ -# -# !!! -# {{ ansible_managed }} -# !!! - -network: - version: 2 - renderer: networkd - ethernets: -{{ netplan['network']['ethernets']|to_nice_yaml|indent(4, true) }}