From a14c92391be13194aa139ac8dc8921605815ceef Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Mon, 13 Jan 2020 13:27:11 +0100
Subject: [PATCH] Add test group with re2o-test

---
 base.yml          | 14 +++++++++-----
 clean_servers.yml |  2 +-
 hosts             |  3 +++
 monitoring.yml    |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/base.yml b/base.yml
index ea5eebfe..e47574e9 100644
--- a/base.yml
+++ b/base.yml
@@ -1,14 +1,11 @@
 ---
 # Deploy common Crans configuration and tools
-- hosts: server
+- hosts: server,test_vm
   vars:
     # Debian mirror on adm
     debian_mirror: http://mirror.adm.crans.org/debian
     debian_components: main non-free
 
-    # Backup password
-    backuppc_rsyncd_passwd: "{{ vault_backuppc_rsyncd_passwd }}"
-
     # NTP servers
     # TODO get this list with re2o
     ntp_servers:
@@ -18,10 +15,17 @@
     - debian-apt-sources
     - common-security
     - common-tools
-    - rsync-client
     - ntp-client
     - nfs-common
 
+# Deploy backup system
+- hosts: server
+  vars:
+    # Backup password
+    backuppc_rsyncd_passwd: "{{ vault_backuppc_rsyncd_passwd }}"
+  roles:
+    - rsync-client
+
 # Plug LDAP on all servers
 - hosts: server
   vars:
diff --git a/clean_servers.yml b/clean_servers.yml
index 3b514249..91412a6b 100644
--- a/clean_servers.yml
+++ b/clean_servers.yml
@@ -2,7 +2,7 @@
 # This is a special playbook to clean old stuff from BCFG2
 # it will disapear when BCFG2 will disapear
 # `apt-mark showmanual` is a good start
-- hosts: server
+- hosts: server,test_vm
   tasks:
     - name: Clean up unused packages
       apt:
diff --git a/hosts b/hosts
index 0ad20421..4131e7de 100644
--- a/hosts
+++ b/hosts
@@ -4,6 +4,9 @@
 # > We name servers according to location, then type.
 # > Then we regroup everything in global geographic and type groups.
 
+[test_vm]
+re2o-test.adm.crans.org
+
 [crans_physical]
 charybde.adm.crans.org
 cochon.adm.crans.org
diff --git a/monitoring.yml b/monitoring.yml
index 4227b3ec..98968977 100644
--- a/monitoring.yml
+++ b/monitoring.yml
@@ -26,7 +26,7 @@
     - prometheus-blackbox-exporter
 
 # Monitor all hosts
-- hosts: server
+- hosts: server,test_vm
   roles:
     - prometheus-node-exporter
 
-- 
GitLab