From dce5a59b2b2b54323d296dbd6fb4e3330291135a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20L=C3=A1szl=C3=B3?= <rlacko99@gmail.com>
Date: Thu, 16 Sep 2021 10:46:49 +0200
Subject: [PATCH] Remove netplan
---
tasks/main.yml | 4 ----
tasks/netplan.yaml | 23 -------------------
.../99-disable-network-config.cfg.j2 | 7 ------
templates/etc/netplan/01-netcfg.yaml.j2 | 10 --------
4 files changed, 44 deletions(-)
delete mode 100644 tasks/netplan.yaml
delete mode 100644 templates/etc/cloud/cloud.cfg.d/99-disable-network-config.cfg.j2
delete mode 100644 templates/etc/netplan/01-netcfg.yaml.j2
diff --git a/tasks/main.yml b/tasks/main.yml
index 5986cbc..5157bf6 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 a0a6294..0000000
--- 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 c12ad78..0000000
--- 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 8cd0c6f..0000000
--- 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) }}
--
GitLab