From 19da17b6e1e25513d32c41c71915f49b822abd42 Mon Sep 17 00:00:00 2001 From: Julian Labus Date: Mon, 5 Nov 2018 15:42:47 +0100 Subject: [PATCH] Revert "Add roles network-loopback + network-anycast" This reverts commit d66f8805398cab71d26cef7d8a99defd1ef5f7ca. --- playbooks/gateways.yml | 2 -- playbooks/monitoring.yml | 1 - roles/network-anycast/README.md | 11 ----------- roles/network-anycast/handlers/main.yml | 5 ----- roles/network-anycast/tasks/main.yml | 6 ------ roles/network-anycast/templates/anycast.j2 | 8 -------- roles/network-loopback/README.md | 11 ----------- roles/network-loopback/handlers/main.yml | 5 ----- roles/network-loopback/tasks/main.yml | 6 ------ roles/network-loopback/templates/loopback.j2 | 8 -------- 10 files changed, 63 deletions(-) delete mode 100644 roles/network-anycast/README.md delete mode 100644 roles/network-anycast/handlers/main.yml delete mode 100644 roles/network-anycast/tasks/main.yml delete mode 100644 roles/network-anycast/templates/anycast.j2 delete mode 100644 roles/network-loopback/README.md delete mode 100644 roles/network-loopback/handlers/main.yml delete mode 100644 roles/network-loopback/tasks/main.yml delete mode 100644 roles/network-loopback/templates/loopback.j2 diff --git a/playbooks/gateways.yml b/playbooks/gateways.yml index 716411e..8ce445f 100755 --- a/playbooks/gateways.yml +++ b/playbooks/gateways.yml @@ -6,8 +6,6 @@ - prerequisites - server-apt-repos - server-basic - - network-loopback - - network-anycast - users - system-sysctl - git-repos diff --git a/playbooks/monitoring.yml b/playbooks/monitoring.yml index 3cc1569..578bcb7 100755 --- a/playbooks/monitoring.yml +++ b/playbooks/monitoring.yml @@ -6,7 +6,6 @@ - prerequisites - server-apt-repos - server-basic - - network-loopback - users - system-sysctl - git-repos diff --git a/roles/network-anycast/README.md b/roles/network-anycast/README.md deleted file mode 100644 index ef730a2..0000000 --- a/roles/network-anycast/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Ansible role network-anycast - -Diese Ansible role konfiguriert das FFMWU Anycast Interface. - -- dummy interface -- Anycast IP - -## Benötigte Variablen - -- ffmwu_anycast_ipv4 # Anycast IPv4 Adresse -- ffmwu_anycast_ipv6 # Anycast IPv6 Adresse diff --git a/roles/network-anycast/handlers/main.yml b/roles/network-anycast/handlers/main.yml deleted file mode 100644 index 191d07d..0000000 --- a/roles/network-anycast/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: reload network interfaces - systemd: - name: networking - state: reloaded diff --git a/roles/network-anycast/tasks/main.yml b/roles/network-anycast/tasks/main.yml deleted file mode 100644 index a0ca123..0000000 --- a/roles/network-anycast/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: create anycast interface - template: - src: anycast.j2 - dest: "/etc/network/interfaces.d/anycast" - notify: reload network interfaces diff --git a/roles/network-anycast/templates/anycast.j2 b/roles/network-anycast/templates/anycast.j2 deleted file mode 100644 index 91b9653..0000000 --- a/roles/network-anycast/templates/anycast.j2 +++ /dev/null @@ -1,8 +0,0 @@ -# -# {{ ansible_managed }} -# -auto anycast -iface anycast - link-type dummy - address {{ ffmwu_anycast_ipv4 | ipaddr('network/prefix') }} - address {{ ffmwu_anycast_ipv6 | ipaddr('network/prefix') }} diff --git a/roles/network-loopback/README.md b/roles/network-loopback/README.md deleted file mode 100644 index fa5bc9f..0000000 --- a/roles/network-loopback/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Ansible role network-loopback - -Diese Ansible role konfiguriert das FFMWU Loopback Interface. - -- dummy interface -- Loopback IP - -## Benötigte Variablen - -- ffmwu_loopback_net_ipv4 # IPv4-Subnetz aus dem die Loopback IPs berechnet werden -- ffmwu_loopback_net_ipv6 # IPv6-Subnetz aus dem die Loopback IPs berechnet werden diff --git a/roles/network-loopback/handlers/main.yml b/roles/network-loopback/handlers/main.yml deleted file mode 100644 index 191d07d..0000000 --- a/roles/network-loopback/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: reload network interfaces - systemd: - name: networking - state: reloaded diff --git a/roles/network-loopback/tasks/main.yml b/roles/network-loopback/tasks/main.yml deleted file mode 100644 index 0dd7564..0000000 --- a/roles/network-loopback/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: create loopback interface - template: - src: loopback.j2 - dest: "/etc/network/interfaces.d/loopback" - notify: reload network interfaces diff --git a/roles/network-loopback/templates/loopback.j2 b/roles/network-loopback/templates/loopback.j2 deleted file mode 100644 index dd6ccd1..0000000 --- a/roles/network-loopback/templates/loopback.j2 +++ /dev/null @@ -1,8 +0,0 @@ -# -# {{ ansible_managed }} -# -auto loopback -iface loopback - link-type dummy - address {{ ffmwu_loopback_net_ipv4 | ipsubnet(32, magic) | ipaddr('network/prefix') }} - address {{ ffmwu_loopback_net_ipv6 | ipaddr(magic) | ipaddr('address') }}/128