Merge branch 'update_inventory' into 'master'

Merge prod and testing inventories

See merge request aurore/ansible!11

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

hosts_testing

@@ -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
-