Rename fy to fyre

base.yml

@@ -4,9 +4,7 @@
   vars:
     # Debian mirror on adm
     debian_mirror: http://mirror.adm.crans.org/debian
-    debian_components: |
+    debian_components: main non-free
-      main{% if ansible_system_vendor != 'QEMU' %} non-free{% endif %}
-    # TODO: non free should only be for SMTP and microcode on non VM/LXC
 
     # 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

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

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'