tests: clean up / deduplicate Ansible inventory.

tests/ansible/hosts/connection-delegation

@@ -1,12 +0,0 @@
-[connection-delegation-test]
-cd-bastion
-cd-rack11 mitogen_via=ssh-user@cd-bastion
-cd-rack11a mitogen_via=root@cd-rack11
-cd-rack11a-docker mitogen_via=docker-admin@cd-rack11a ansible_connection=docker
-
-[connection-delegation-cycle]
-# Create cycle with Docker container.
-cdc-bastion mitogen_via=cdc-rack11a-docker
-cdc-rack11 mitogen_via=ssh-user@cdc-bastion
-cdc-rack11a mitogen_via=root@cdc-rack11
-cdc-rack11a-docker mitogen_via=docker-admin@cdc-rack11a ansible_connection=docker

tests/ansible/hosts/connection_delegation.hosts

@@ -1,38 +1,18 @@
 # vim: syntax=dosini
 
+# Connection delegation scenarios. It's impossible to connect to them, but their would-be
+# config can be inspected using "mitogen_get_stack" action.
 
-# This must be defined explicitly, otherwise _create_implicit_localhost()
-# generates its own copy, which includes an ansible_python_interpreter that
-# varies according to host machine.
-localhost
 
-[connection-delegation-test]
-cd-bastion
-cd-rack11 mitogen_via=ssh-user@cd-bastion
-cd-rack11a mitogen_via=root@cd-rack11
-cd-rack11a-docker mitogen_via=docker-admin@cd-rack11a ansible_connection=docker
-
-[connection-delegation-cycle]
-# Create cycle with Docker container.
-cdc-bastion mitogen_via=cdc-rack11a-docker
-cdc-rack11 mitogen_via=ssh-user@cdc-bastion
-cdc-rack11a mitogen_via=root@cdc-rack11
-cdc-rack11a-docker mitogen_via=docker-admin@cdc-rack11a ansible_connection=docker
-
-[conn-delegation]
-cd-user1 ansible_user=mitogen__user1 ansible_connection=mitogen_sudo mitogen_via=target
-
-
-# Connection delegation scenarios. It's impossible to connection to them, but
-# you can inspect the would-be config via "mitogen_get_stack" action.
-[cd-no-connect]
 # Normal inventory host, no aliasing.
 cd-normal ansible_connection=mitogen_doas ansible_user=normal-user
+
 # Inventory host that is really a different host.
 cd-alias ansible_connection=ssh ansible_user=alias-user ansible_host=alias-host
 
 # Via one normal host.
 cd-normal-normal mitogen_via=cd-normal
+
 # Via one aliased host.
 cd-normal-alias mitogen_via=cd-alias
 
@@ -41,3 +21,19 @@ cd-newuser-normal-normal mitogen_via=cd-normal ansible_user=newuser-normal-norma
 
 # doas:newuser via host.
 cd-newuser-doas-normal mitogen_via=cd-normal ansible_connection=mitogen_doas ansible_user=newuser-doas-normal-user
+
+
+[connection-delegation-test]
+cd-bastion
+cd-rack11 mitogen_via=ssh-user@cd-bastion
+cd-rack11a mitogen_via=root@cd-rack11
+cd-rack11a-docker mitogen_via=docker-admin@cd-rack11a ansible_connection=docker
+
+
+[connection-delegation-cycle]
+# Create cycle with Docker container.
+cdc-bastion mitogen_via=cdc-rack11a-docker
+cdc-rack11 mitogen_via=ssh-user@cdc-bastion
+cdc-rack11a mitogen_via=root@cdc-rack11
+cdc-rack11a-docker mitogen_via=docker-admin@cdc-rack11a ansible_connection=docker
+

tests/ansible/hosts/default.hosts

@@ -0,0 +1,8 @@
+# vim: syntax=dosini
+
+# When running the tests outside CI, make a single 'target' host which is the
+# local machine.
+target ansible_host=localhost
+
+[test-targets]
+target

tests/ansible/hosts/k3.hosts

@@ -1,3 +1,6 @@
+# vim: syntax=dosini
+
+# Used for manual testing.
 k3
 
 [k3-x10]

tests/ansible/hosts/localhost

@@ -1,8 +0,0 @@
-localhost
-target ansible_host=localhost
-
-[test-targets]
-target
-
-[localhost-x10]
-localhost-[01:10]

tests/ansible/hosts/localhost.hosts

@@ -0,0 +1,10 @@
+# vim: syntax=dosini
+
+# This must be defined explicitly, otherwise _create_implicit_localhost()
+# generates its own copy, which includes an ansible_python_interpreter that
+# varies according to host machine.
+localhost
+
+# This is only used for manual testing.
+[localhost-x10]
+localhost-[01:10]

tests/ansible/hosts/nessy

@@ -1,10 +0,0 @@
-nessy
-
-[nessy-x10]
-nessy-[00:10]
-
-[nessy-x20]
-nessy-[00:20]
-
-[nessy-x50]
-nessy-[00:50]

tests/ansible/hosts/z

@@ -1,25 +0,0 @@
-z
-
-[z-x10]
-z-[01:10]
-
-[z-x20]
-z-[01:20]
-
-[z-x50]
-z-[01:50]
-
-[z-x100]
-z-[001:100]
-
-[z-x200]
-z-[001:200]
-
-[z-x300]
-z-[001:300]
-
-[z-x400]
-z-[001:400]
-
-[z-x500]
-z-[001:500]