Merge branch 'master' into 'aurore-dev'

# Conflicts:
#   .gitignore
#   hosts
#   network.yml
#   proxmox.yml
This commit is contained in:
Alexandre IOOSS 2020-05-03 16:11:19 +02:00
commit 81592fa986
17 changed files with 838 additions and 267 deletions

17
hosts
View file

@ -2,7 +2,6 @@
# How to name your server ?
# > We name servers according to location, then type.
# > So all containers at OVH are in ovh-container.
# > Then we regroup everything in global geographic and type groups.
[aurore_pve]
@ -49,13 +48,14 @@ dhcp-fleming-backup.adm.auro.re
dns-fleming.adm.auro.re
dns-fleming-backup.adm.auro.re
prometheus-fleming.adm.auro.re
#prometheus-fleming-fo.adm.auro.re
radius-fleming.adm.auro.re
radius-fleming-backup.adm.auro.re
unifi-fleming.adm.auro.re
routeur-fleming.adm.auro.re
routeur-fleming-backup.adm.auro.re
[pacaterie_pve]
[pacaterie_physical]
mordred.adm.auro.re
titan.adm.auro.re
@ -67,6 +67,7 @@ dhcp-pacaterie-backup.adm.auro.re
dns-pacaterie.adm.auro.re
dns-pacaterie-backup.adm.auro.re
prometheus-pacaterie.adm.auro.re
#prometheus-pacaterie-fo.adm.auro.re
radius-pacaterie.adm.auro.re
radius-pacaterie-backup.adm.auro.re
unifi-pacaterie.adm.auro.re
@ -100,23 +101,21 @@ dhcp-gs.adm.auro.re
# everything at ovh
[ovh:children]
ovh_pve
ovh_physical
ovh_container
ovh_vm
# everything at ovh_testing
[ovh_testing:children]
ovh_testing_vm
# everything at fleming
[fleming:children]
fleming_pve
fleming_physical
fleming_vm
fleming_unifi
# everything at pacaterie
[pacaterie:children]
pacaterie_pve
pacaterie_physical
pacaterie_vm
pacaterie_unifi
# everything at edc
[edc:children]