From a679c5f7b930406a0d76ed179c0cfb3096a40e78 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Thu, 5 Dec 2019 20:42:13 +0100
Subject: [PATCH] Rename fy to fyre
---
base.yml | 7 ++-----
hosts | 2 +-
monitoring.yml | 4 ++--
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/base.yml b/base.yml
index 5d905d0e..56aa79a7 100644
--- a/base.yml
+++ b/base.yml
@@ -4,9 +4,7 @@
vars:
# Debian mirror on adm
debian_mirror: http://mirror.adm.crans.org/debian
- debian_components: |
- main{% if ansible_system_vendor != 'QEMU' %} non-free{% endif %}
- # TODO: non free should only be for SMTP and microcode on non VM/LXC
+ debian_components: main non-free
# Backup password
backuppc_rsyncd_passwd: "{{ vault_backuppc_rsyncd_passwd }}"
@@ -14,7 +12,6 @@
# NTP servers
# TODO get this list with re2o
ntp_servers:
- - fy.adm.crans.org
- charybde.adm.crans.org
- silice.adm.crans.org
roles:
@@ -70,7 +67,7 @@
# Redirect local mail to mailserver
# Should be on server,!redisdead.adm.crans.org
-- hosts: prometheus.adm.crans.org
+- hosts: prometheus.adm.crans.org,fyre.adm.crans.org
vars:
mail_root: root@crans.org
mail_snmp_server: smtp.adm.crans.org
diff --git a/hosts b/hosts
index 45be87c5..8d7365d2 100644
--- a/hosts
+++ b/hosts
@@ -8,7 +8,7 @@
charybde.adm.crans.org
cochon.adm.crans.org
ft.adm.crans.org
-fy.adm.crans.org
+fyre.adm.crans.org
fz.adm.crans.org
gateau.adm.crans.org
gulp.adm.crans.org
diff --git a/monitoring.yml b/monitoring.yml
index 0750ea41..d7dedada 100644
--- a/monitoring.yml
+++ b/monitoring.yml
@@ -1,6 +1,6 @@
---
# Deploy Prometheus
-- hosts: prometheus.adm.crans.org
+- hosts: prometheus.adm.crans.org,fyre.adm.crans.org
vars:
# Prometheus targets.json
prometheus_targets:
@@ -36,7 +36,7 @@
- prometheus-apache-exporter
# Deploy grafana
-- hosts: fy.adm.crans.org
+- hosts: fyre.adm.crans.org
vars:
grafana_root_url: https://grafana.crans.org
ldap_base: 'dc=crans,dc=org'
--
GitLab