[PATCH v1 3/8] gen_hosts: Get the "separate kernel builder" workflow working again

From: Chuck Lever <[email protected]>

The [all] group contained the wrong host name. This causes
"-m wait_for_connection -i all" to hang indefinitely.

The [dev] group was missing, resulting in needless warnings.

The only thing the linux workflow does is run a separate kernel
builder node. The separate logic for nixos and the service hosts
isn't needed, AFAICT.

Let's start over with a simple template.

Fixes: 40df5ef72d19 ("gen_hosts: use kdevops_workflow_name directly for template selection")
Signed-off-by: Chuck Lever <[email protected]>
---
 .../gen_hosts/templates/workflows/linux.j2    | 97 +------------------
 1 file changed, 3 insertions(+), 94 deletions(-)

diff --git a/playbooks/roles/gen_hosts/templates/workflows/linux.j2 b/playbooks/roles/gen_hosts/templates/workflows/linux.j2
index 5d9ebb67e900..6a1459d873ae 100644
--- a/playbooks/roles/gen_hosts/templates/workflows/linux.j2
+++ b/playbooks/roles/gen_hosts/templates/workflows/linux.j2
@@ -1,110 +1,19 @@
-{# Template for Linux custom kernel workflow #}
+{# Template for the kernel builder workflow #}
 [all]
 localhost ansible_connection=local
-{% if kdevops_enable_nixos|default(false) %}
-{{ kdevops_host_prefix }} ansible_python_interpreter=/run/current-system/sw/bin/python3
-{% else %}
-{{ kdevops_host_prefix }}
-{% endif %}
-{% if kdevops_baseline_and_dev == True %}
-{% if kdevops_enable_nixos|default(false) %}
-{{ kdevops_host_prefix }}-dev ansible_python_interpreter=/run/current-system/sw/bin/python3
-{% else %}
-{{ kdevops_host_prefix }}-dev
-{% endif %}
-{% endif %}
-{% if kdevops_enable_iscsi %}
-{{ kdevops_host_prefix }}-iscsi
-{% endif %}
-{% if kdevops_nfsd_enable %}
-{{ kdevops_host_prefix }}-nfsd
-{% endif %}
-{% if kdevops_smbd_enable|default(false) %}
-{{ kdevops_host_prefix }}-smbd
-{% endif %}
-{% if kdevops_krb5kdc_enable|default(false) %}
-{{ kdevops_host_prefix }}-kdc
-{% endif %}
-
+{{ kdevops_hosts_prefix }}-builder
 [all:vars]
 ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
 
 [baseline]
-{% if kdevops_enable_nixos|default(false) %}
-{{ kdevops_host_prefix }} ansible_python_interpreter=/run/current-system/sw/bin/python3
-{% else %}
-{{ kdevops_host_prefix }}
-{% endif %}
-
+{{ kdevops_hosts_prefix }}-builder
 [baseline:vars]
 ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
 
-{% if kdevops_baseline_and_dev %}
 [dev]
-{% if kdevops_enable_nixos|default(false) %}
-{{ kdevops_host_prefix }}-dev ansible_python_interpreter=/run/current-system/sw/bin/python3
-{% else %}
-{{ kdevops_host_prefix }}-dev
-{% endif %}
-
 [dev:vars]
 ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
-{% endif %}
-
-[linux]
-{{ kdevops_host_prefix }}
-{% if kdevops_baseline_and_dev == True %}
-{{ kdevops_host_prefix }}-dev
-{% endif %}
-
-[linux:vars]
-ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
-
-{% if kdevops_enable_iscsi %}
-[iscsi]
-{{ kdevops_host_prefix }}-iscsi
-
-[iscsi:vars]
-ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
-{% endif %}
-
-{% if kdevops_nfsd_enable %}
-[nfsd]
-{{ kdevops_host_prefix }}-nfsd
-
-[nfsd:vars]
-ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
-{% endif %}
-
-{% if kdevops_smbd_enable|default(false) %}
-[smbd]
-{{ kdevops_host_prefix }}-smbd
-
-[smbd:vars]
-ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
-{% endif %}
-
-{% if kdevops_krb5kdc_enable|default(false) %}
-[kdc]
-{{ kdevops_host_prefix }}-kdc
-
-[kdc:vars]
-ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
-{% endif %}
 
 [service]
-{% if kdevops_enable_iscsi %}
-{{ kdevops_host_prefix }}-iscsi
-{% endif %}
-{% if kdevops_nfsd_enable %}
-{{ kdevops_host_prefix }}-nfsd
-{% endif %}
-{% if kdevops_smbd_enable|default(false) %}
-{{ kdevops_host_prefix }}-smbd
-{% endif %}
-{% if kdevops_krb5kdc_enable|default(false) %}
-{{ kdevops_host_prefix }}-kdc
-{% endif %}
-
 [service:vars]
 ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
-- 
2.51.0