From e769d8d5ccec8e3fa0b56cd9db23ac635434104b Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Mon, 4 Mar 2019 09:23:50 +0100 Subject: [PATCH] Merge prod and testing inventories --- hosts | 17 ++++++++++++----- hosts_testing | 27 --------------------------- 2 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 hosts_testing diff --git a/hosts b/hosts index fadd3bf..34cdde3 100644 --- a/hosts +++ b/hosts @@ -14,7 +14,7 @@ synapse.adm.auro.re codimd.adm.auro.re services-bdd.adm.auro.re phabricator.adm.auro.re -horus-wiki ansible_host=10.128.0.51 +wiki.adm.auro.re www.adm.auro.re pad.adm.auro.re proxy.adm.auro.re @@ -25,13 +25,16 @@ re2o-ldap.adm.auro.re re2o-db.adm.auro.re serge.adm.auro.re +[ovh-testing-vm] +re2o-test.adm.auro.re + [fleming-pve] -freya.adm.auro.re -odin.adm.auro.re +#freya.adm.auro.re +#odin.adm.auro.re [fleming-vm-ldap-replica] -ldap-replica-fleming1.adm.auro.re -ldap-replica-fleming2.adm.auro.re +#ldap-replica-fleming1.adm.auro.re +#ldap-replica-fleming2.adm.auro.re # everything at ovh [ovh:children] @@ -39,6 +42,10 @@ ovh-pve ovh-container ovh-vm +# everything at ovh-testing +[ovh-testing:children] +ovh-testing-vm + # everything at fleming [fleming:children] fleming-pve diff --git a/hosts_testing b/hosts_testing deleted file mode 100644 index 1e84600..0000000 --- a/hosts_testing +++ /dev/null @@ -1,27 +0,0 @@ -# Aurore servers inventory - -[ovh-testing-pve] - -[ovh-testing-container] - -[ovh-testing-vm] -re2o-test.adm.auro.re - -# everything at ovh-testing -[ovh-testing:children] -ovh-testing-pve -ovh-testing-container -ovh-testing-vm - -# every LXC container -[container:children] -ovh-testing-container - -# every virtual machine -[vm:children] -ovh-testing-vm - -# every PVE -[pve:children] -ovh-testing-pve -