tests: a few more inventory helpers.

tests/ansible/common-hosts

@@ -1,37 +0,0 @@
-# vim: syntax=dosini
-
-[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
-
-# newuser@host via host with explicit username.
-cd-newuser-normal-normal mitogen_via=cd-normal ansible_user=newuser-normal-normal-user
-
-# doas:newuser via host.
-cd-newuser-doas-normal mitogen_via=cd-normal ansible_connection=mitogen_doas ansible_user=newuser-doas-normal-user

tests/ansible/hosts/common-hosts

@@ -1 +0,0 @@
-../common-hosts

tests/ansible/hosts/common-hosts

@@ -0,0 +1,37 @@
+# vim: syntax=dosini
+
+[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
+
+# newuser@host via host with explicit username.
+cd-newuser-normal-normal mitogen_via=cd-normal ansible_user=newuser-normal-normal-user
+
+# doas:newuser via host.
+cd-newuser-doas-normal mitogen_via=cd-normal ansible_connection=mitogen_doas ansible_user=newuser-doas-normal-user

tests/ansible/hosts/k3

@@ -0,0 +1,13 @@
+k3
+
+[k3-x10]
+k3-[01:10]
+
+[k3-x20]
+k3-[01:20]
+
+[k3-x40]
+k3-[01:40]
+
+[k3-x80]
+k3-[01:80]

tests/ansible/hosts/localhost

@@ -1,14 +1,8 @@
-[test-targets]
+localhost
 target ansible_host=localhost
 
+[test-targets]
+target
+
 [localhost-x10]
-localhost-1
-localhost-2
-localhost-3
-localhost-4
-localhost-5
-localhost-6
-localhost-7
-localhost-8
-localhost-9
-localhost-10
+localhost-[01:10]

tests/ansible/hosts/nessy

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