From 262696970fdeffd208dbb1489f9519230bcce151 Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Mon, 22 Feb 2021 11:44:51 +0100
Subject: [PATCH] [network-interfaces] PEPCRANSED
---
group_vars/all/network_interfaces.yml | 30 ++++++++++++++++
plays/network-interfaces.yml | 35 -------------------
plays/network_interfaces.yml | 7 ++++
plays/root.yml | 1 +
.../tasks/main.yml | 2 +-
.../templates/network/interfaces.d/ifalias.j2 | 0
.../templates/network/interfaces.j2 | 0
7 files changed, 39 insertions(+), 36 deletions(-)
create mode 100644 group_vars/all/network_interfaces.yml
delete mode 100755 plays/network-interfaces.yml
create mode 100755 plays/network_interfaces.yml
rename roles/{interfaces => network-interfaces}/tasks/main.yml (94%)
rename roles/{interfaces => network-interfaces}/templates/network/interfaces.d/ifalias.j2 (100%)
rename roles/{interfaces => network-interfaces}/templates/network/interfaces.j2 (100%)
diff --git a/group_vars/all/network_interfaces.yml b/group_vars/all/network_interfaces.yml
new file mode 100644
index 00000000..2a5a4e94
--- /dev/null
+++ b/group_vars/all/network_interfaces.yml
@@ -0,0 +1,30 @@
+glob_network_interfaces:
+ vlan:
+ - name: srv
+ id: 2
+ gateway: 185.230.79.4 # 185.230.79.62
+ dns: 185.230.79.4 # 185.230.79.62
+ gateway_v6: 2a0c:700:2::ff:fe00:9902
+ - name: srv_nat
+ id: 3
+ gateway: 172.16.3.99
+ dns: 172.16.3.99
+ gateway_v6: 2a0c:700:3::ff:fe00:9903
+ - name: san
+ id: 4
+ - name: adm
+ id: 10
+ dns: 172.16.10.101 172.16.10.102
+ - name: infra
+ id: 11
+ dns: 172.16.32.99
+ - name: adh
+ id: 12
+ gateway: 185.230.78.99
+ dns: 185.230.78.99
+ gateway_v6: 2a0c:700:12::ff:fe00:9912
+ - name: adh_nat
+ id: 13
+ gateway: 100.64.0.99
+ dns: 100.64.0.99
+ gateway_v6: 2a0c:700:13::ff:fe00:9913
diff --git a/plays/network-interfaces.yml b/plays/network-interfaces.yml
deleted file mode 100755
index 8d7a0511..00000000
--- a/plays/network-interfaces.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env ansible-playbook
----
-- hosts: crans_vm,!routeurs_vm
- vars:
- vlan:
- - name: srv
- id: 2
- gateway: 185.230.79.4 # 185.230.79.62
- dns: 185.230.79.4 # 185.230.79.62
- gateway_v6: 2a0c:700:2::ff:fe00:9902
- - name: srv_nat
- id: 3
- gateway: 172.16.3.99
- dns: 172.16.3.99
- gateway_v6: 2a0c:700:3::ff:fe00:9903
- - name: san
- id: 4
- - name: adm
- id: 10
- dns: 172.16.10.101 172.16.10.102
- - name: infra
- id: 11
- dns: 172.16.32.99
- - name: adh
- id: 12
- gateway: 185.230.78.99
- dns: 185.230.78.99
- gateway_v6: 2a0c:700:12::ff:fe00:9912
- - name: adh_nat
- id: 13
- gateway: 100.64.0.99
- dns: 100.64.0.99
- gateway_v6: 2a0c:700:13::ff:fe00:9913
- roles:
- - interfaces
diff --git a/plays/network_interfaces.yml b/plays/network_interfaces.yml
new file mode 100755
index 00000000..0673e11b
--- /dev/null
+++ b/plays/network_interfaces.yml
@@ -0,0 +1,7 @@
+#!/usr/bin/env ansible-playbook
+---
+- hosts: crans_vm,!routeurs_vm
+ vars:
+ network_interfaces: "{{ glob_network_interfaces | default({}) | combine(loc_network_interfaces | default({})) }}"
+ roles:
+ - network_interfaces
diff --git a/plays/root.yml b/plays/root.yml
index 7c3dee2f..b2d6a03d 100755
--- a/plays/root.yml
+++ b/plays/root.yml
@@ -77,3 +77,4 @@
- import_playbook: borgbackups_client.yml
- import_playbook: monitoring.yml
+- import_playbook: network_interfaces.yml
diff --git a/roles/interfaces/tasks/main.yml b/roles/network-interfaces/tasks/main.yml
similarity index 94%
rename from roles/interfaces/tasks/main.yml
rename to roles/network-interfaces/tasks/main.yml
index b3a7e4eb..ec282137 100644
--- a/roles/interfaces/tasks/main.yml
+++ b/roles/network-interfaces/tasks/main.yml
@@ -25,4 +25,4 @@
dest: "/etc/network/interfaces.d/{{ '%02d' | format(item.id) }}-{{ item.name | replace('_', '-') }}"
mode: 0644
when: item.name in interfaces
- loop: "{{ vlan }}"
+ loop: "{{ network_interfaces.vlan }}"
diff --git a/roles/interfaces/templates/network/interfaces.d/ifalias.j2 b/roles/network-interfaces/templates/network/interfaces.d/ifalias.j2
similarity index 100%
rename from roles/interfaces/templates/network/interfaces.d/ifalias.j2
rename to roles/network-interfaces/templates/network/interfaces.d/ifalias.j2
diff --git a/roles/interfaces/templates/network/interfaces.j2 b/roles/network-interfaces/templates/network/interfaces.j2
similarity index 100%
rename from roles/interfaces/templates/network/interfaces.j2
rename to roles/network-interfaces/templates/network/interfaces.j2
--
GitLab