From f071959bd8a085cff0f793213027a76bd6933b66 Mon Sep 17 00:00:00 2001
From: Maxime Bombar <bombar@crans.org>
Date: Tue, 28 Jul 2020 11:19:56 +0200
Subject: [PATCH] [New-infra] Restruture hosts file

---
 group_vars/crans_server/vars.yml | 9 +++++++++
 group_vars/crans_vm/vars.yml     | 4 ----
 hosts                            | 8 ++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 group_vars/crans_server/vars.yml
 delete mode 100644 group_vars/crans_vm/vars.yml

diff --git a/group_vars/crans_server/vars.yml b/group_vars/crans_server/vars.yml
new file mode 100644
index 00000000..75c8f4d8
--- /dev/null
+++ b/group_vars/crans_server/vars.yml
@@ -0,0 +1,9 @@
+ldap:
+  local: False
+  servers: ["172.16.1.1"]
+  base: "dc=crans,dc=org"
+
+
+# Parameters for debian mirror
+debian_mirror: http://mirror.adm.crans.org/debian
+debian_components: main non_free
diff --git a/group_vars/crans_vm/vars.yml b/group_vars/crans_vm/vars.yml
deleted file mode 100644
index 6c6608cb..00000000
--- a/group_vars/crans_vm/vars.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-ldap:
-  local: False
-  servers: ["172.16.1.1"]
-  base: "dc=crans,dc=org"
diff --git a/hosts b/hosts
index 1c74dfbe..4948050b 100644
--- a/hosts
+++ b/hosts
@@ -25,6 +25,9 @@
 # [test_vm]
 # re2o-test.adm.crans.org
 
+[crans_routeurs]
+routeur-daniel
+
 [crans_physical]
 tealc
 daniel
@@ -39,11 +42,11 @@ sputnik.adm.crans.org
 [crans_server:children]
 crans_physical
 crans_vm
+crans_routeurs
 
 # everything at crans
 [crans:children]
-crans_physical
-crans_vm
+crans_server
 
 # everything at ovh
 [ovh:children]
@@ -57,6 +60,7 @@ ovh_physical
 # every virtual machine
 [vm:children]
 crans_vm
+crans_routeurs
 
 # every server
 [server:children]