From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E87A1201266 for ; Tue, 9 Sep 2025 00:50:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757379020; cv=none; b=rQUJOZ07xjxlnsHrOZPgea93HpvRnLgxT9y01bXIZsT9GXNOOEhcZMfe/QZgIaIrcoyeHjobKI4iI70QaeUGabrO8yH920F+e2VMyUSXlsqKfhXsLaI+Cjo7/S5orGlWOAU1Jjrp3gngOmuLWM5hOSFfggSHppeitt36MdysAGA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757379020; c=relaxed/simple; bh=hV8h5MPfSdSbQqwiAqbZ9LVy22c2LEpjTAH7l5iAMNs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZiR7/r2KrfYFzF8fySjpzI5lDZjuXjazhnzcNYXx32ClvkaLfPGqOoQp2fPUeY0n95PrkLwIIPX9hwdOX+U8vlX/nwAuXTSf4mlc8xIviYwfWoddEtmKVL1loS0O/UeUqLzWERFEE09RDKLnWsJg/1uSny1sstZzidvvVZ86H0M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=B4pCGF37; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="B4pCGF37" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=Vi0Vwk08EjN8lsozGIKoLaen9SFPEQ8qxXomNnm3HvQ=; b=B4pCGF37dDyQAj/jTZelzwChzb ap1N/W71ReSsD+CiVEzOKNdT3RIuz2W+Vd8735VKKMdQX6kRWSJUyHcSJ+n3yQPDsvI0rsTkNNoeo cSqojxbDl1J8vYjpSykLd5q4Ca+Sm93qs68qpa7QgGFWygoxlwUXg3OZ1PBcWYzObKoqYfMGIC4Mk iQCn9L1UllGEdr31JZANupE/OIRfoCYu45VzwQSTI7VurauiIrb65+7Qvmd6s4cqbCt+ZGg2j9k2g tpOm0/CL98geumakL43xMr3lZpYZueSiZ3pkKnGHWAwX6mHmTmbkfMnPB/BbFGfqwRAntA1ONN24N ImomVoOg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98.2 #2 (Red Hat Linux)) id 1uvmYs-00000003JvC-2LbN; Tue, 09 Sep 2025 00:50:18 +0000 From: Luis Chamberlain To: Chuck Lever , Daniel Gomez , kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 1/2] gen_hosts: remove legacy duplicate workflow templates Date: Mon, 8 Sep 2025 17:50:15 -0700 Message-ID: <20250909005016.791529-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250909005016.791529-1-mcgrof@kernel.org> References: <20250909005016.791529-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain The gen_hosts role has migrated to using a single generic hosts.j2 template that contains all workflow logic internally. The workflow-specific templates at the top level (templates/*.j2) are legacy artifacts from before this migration and are no longer used. These duplicate templates can be safely removed because: 1. The system exclusively uses the generic hosts.j2 template as configured in extra_vars.yaml (kdevops_hosts_template: hosts.j2) 2. The workflow-specific logic is now handled through conditional blocks within the generic hosts.j2 template 3. These legacy templates are not referenced anywhere in the current codebase The files in templates/workflows/*.j2 remain as they represent the modular workflow snippets, though they are also not actively used in the current implementation. Removed legacy templates: - blktests.j2 - cxl.j2 - fio-tests.j2 - fstests.j2 - gitr.j2 - ltp.j2 - mmtests.j2 - nfstest.j2 - pynfs.j2 - selftests.j2 - sysbench.j2 Fixes: 40df5ef72d197 ("gen_hosts: use kdevops_workflow_name directly for template selection") Signed-off-by: Luis Chamberlain --- .../roles/gen_hosts/templates/blktests.j2 | 27 ----- playbooks/roles/gen_hosts/templates/cxl.j2 | 21 ---- .../roles/gen_hosts/templates/fio-tests.j2 | 28 ----- .../roles/gen_hosts/templates/fstests.j2 | 109 ------------------ playbooks/roles/gen_hosts/templates/gitr.j2 | 51 -------- playbooks/roles/gen_hosts/templates/ltp.j2 | 30 ----- .../roles/gen_hosts/templates/mmtests.j2 | 36 ------ .../roles/gen_hosts/templates/nfstest.j2 | 51 -------- playbooks/roles/gen_hosts/templates/pynfs.j2 | 34 ------ .../roles/gen_hosts/templates/selftests.j2 | 27 ----- .../roles/gen_hosts/templates/sysbench.j2 | 27 ----- 11 files changed, 441 deletions(-) delete mode 100644 playbooks/roles/gen_hosts/templates/blktests.j2 delete mode 100644 playbooks/roles/gen_hosts/templates/cxl.j2 delete mode 100644 playbooks/roles/gen_hosts/templates/fio-tests.j2 delete mode 100644 playbooks/roles/gen_hosts/templates/fstests.j2 delete mode 100644 playbooks/roles/gen_hosts/templates/gitr.j2 delete mode 100644 playbooks/roles/gen_hosts/templates/ltp.j2 delete mode 100644 playbooks/roles/gen_hosts/templates/mmtests.j2 delete mode 100644 playbooks/roles/gen_hosts/templates/nfstest.j2 delete mode 100644 playbooks/roles/gen_hosts/templates/pynfs.j2 delete mode 100644 playbooks/roles/gen_hosts/templates/selftests.j2 delete mode 100644 playbooks/roles/gen_hosts/templates/sysbench.j2 diff --git a/playbooks/roles/gen_hosts/templates/blktests.j2 b/playbooks/roles/gen_hosts/templates/blktests.j2 deleted file mode 100644 index 6aa434c3..00000000 --- a/playbooks/roles/gen_hosts/templates/blktests.j2 +++ /dev/null @@ -1,27 +0,0 @@ -[all] -localhost ansible_connection=local -{% for test_type in blktests_enabled_test_types %} -{{ kdevops_host_prefix }}-{{ test_type }} -{% if kdevops_baseline_and_dev %} -{{ kdevops_host_prefix }}-{{ test_type }}-dev -{% endif %} -{% endfor %} -[all:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[baseline] -{% for test_type in blktests_enabled_test_types %} -{{ kdevops_host_prefix }}-{{ test_type }} -{% endfor %} -[baseline:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[dev] -{% if kdevops_baseline_and_dev %} - {% for test_type in blktests_enabled_test_types %} -{{ kdevops_host_prefix }}-{{ test_type }}-dev - {% endfor %} -{% endif %} -[dev:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[service] -[service:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/cxl.j2 b/playbooks/roles/gen_hosts/templates/cxl.j2 deleted file mode 100644 index cab7da24..00000000 --- a/playbooks/roles/gen_hosts/templates/cxl.j2 +++ /dev/null @@ -1,21 +0,0 @@ -[all] -localhost ansible_connection=local -{{ kdevops_hosts_prefix }} -{% if kdevops_baseline_and_dev == True %} -{{ kdevops_hosts_prefix }}-dev -{% endif %} -[all:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[baseline] -{{ kdevops_hosts_prefix }} -[baseline:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[dev] -{% if kdevops_baseline_and_dev %} -{{ kdevops_hosts_prefix }}-dev -{% endif %} -[dev:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[service] -[service:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/fio-tests.j2 b/playbooks/roles/gen_hosts/templates/fio-tests.j2 deleted file mode 100644 index 75bc0c53..00000000 --- a/playbooks/roles/gen_hosts/templates/fio-tests.j2 +++ /dev/null @@ -1,28 +0,0 @@ -[all] -localhost ansible_connection=local -{{ kdevops_host_prefix }}-fio-tests -{% if kdevops_baseline_and_dev %} -{{ kdevops_host_prefix }}-fio-tests-dev -{% endif %} -[all:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[baseline] -{{ kdevops_host_prefix }}-fio-tests -[baseline:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[dev] -{% if kdevops_baseline_and_dev %} -{{ kdevops_host_prefix }}-fio-tests-dev -{% endif %} -[dev:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[fio_tests] -{{ kdevops_host_prefix }}-fio-tests -{% if kdevops_baseline_and_dev %} -{{ kdevops_host_prefix }}-fio-tests-dev -{% endif %} -[fio_tests:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[service] -[service:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/fstests.j2 b/playbooks/roles/gen_hosts/templates/fstests.j2 deleted file mode 100644 index 823dbb1e..00000000 --- a/playbooks/roles/gen_hosts/templates/fstests.j2 +++ /dev/null @@ -1,109 +0,0 @@ -[all] -localhost ansible_connection=local -{% for s in fstests_enabled_test_types %} -{% if kdevops_enable_nixos|default(false) %} -{{ kdevops_host_prefix }}-{{ s }} ansible_python_interpreter=/run/current-system/sw/bin/python3 -{% else %} -{{ kdevops_host_prefix }}-{{ s }} -{% endif %} -{% if kdevops_baseline_and_dev %} -{% if kdevops_enable_nixos|default(false) %} -{{ kdevops_host_prefix }}-{{ s }}-dev ansible_python_interpreter=/run/current-system/sw/bin/python3 -{% else %} -{{ kdevops_host_prefix }}-{{ s }}-dev -{% endif %} -{% endif %} -{% endfor %} -{% if kdevops_nfsd_enable %} -{% if kdevops_loopback_nfs_enable %} -{{ kdevops_hosts_prefix }}-nfsd -{% endif %} -{% endif %} -[all:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[baseline] -{% for s in fstests_enabled_test_types %} -{% if kdevops_enable_nixos|default(false) %} -{{ kdevops_host_prefix }}-{{ s }} ansible_python_interpreter=/run/current-system/sw/bin/python3 -{% else %} -{{ kdevops_host_prefix }}-{{ s }} -{% endif %} -{% endfor %} -{% if kdevops_nfsd_enable %} -{% if kdevops_loopback_nfs_enable %} -{{ kdevops_hosts_prefix }}-nfsd -{% endif %} -{% endif %} -[baseline:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[dev] -{% if kdevops_baseline_and_dev %} - {% for s in fstests_enabled_test_types %} -{% if kdevops_enable_nixos|default(false) %} -{{ kdevops_host_prefix }}-{{ s }}-dev ansible_python_interpreter=/run/current-system/sw/bin/python3 -{% else %} -{{ kdevops_host_prefix }}-{{ s }}-dev -{% endif %} - {% endfor %} -{% if kdevops_nfsd_enable %} -{% if kdevops_loopback_nfs_enable %} -{{ kdevops_hosts_prefix }}-nfsd -{% endif %} -{% endif %} -{% endif %} -[dev:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% if kdevops_enable_iscsi %} -[iscsi] -{{ kdevops_hosts_prefix }}-iscsi -[iscsi:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} -{% if kdevops_nfsd_enable %} -[nfsd] -{{ kdevops_hosts_prefix }}-nfsd -[nfsd:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} -{% if kdevops_smbd_enable %} -[smbd] -{{ kdevops_hosts_prefix }}-smbd -[smbd:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} -{% if kdevops_krb5_enable %} -[kdc] -{{ kdevops_hosts_prefix }}-kdc -[kdc:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[krb5] -{% for s in fstests_enabled_test_types %} -{% if kdevops_enable_nixos|default(false) %} -{{ kdevops_host_prefix }}-{{ s }} ansible_python_interpreter=/run/current-system/sw/bin/python3 -{% else %} -{{ kdevops_host_prefix }}-{{ s }} -{% endif %} -{% endfor %} -{% if kdevops_nfsd_enable %} -{{ kdevops_hosts_prefix }}-nfsd -{% endif %} -[krb5:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} -{% if kdevops_enable_iscsi or kdevops_nfsd_enable or kdevops_smbd_enable or kdevops_krb5_enable %} -[service] -{% if kdevops_enable_iscsi %} -{{ kdevops_hosts_prefix }}-iscsi -{% endif %} -{% if kdevops_nfsd_enable %} -{{ kdevops_hosts_prefix }}-nfsd -{% endif %} -{% if kdevops_smbd_enable %} -{{ kdevops_hosts_prefix }}-smbd -{% endif %} -{% if kdevops_krb5_enable %} -{{ kdevops_hosts_prefix }}-kdc -{% endif %} -[service:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} diff --git a/playbooks/roles/gen_hosts/templates/gitr.j2 b/playbooks/roles/gen_hosts/templates/gitr.j2 deleted file mode 100644 index 3f30a5fb..00000000 --- a/playbooks/roles/gen_hosts/templates/gitr.j2 +++ /dev/null @@ -1,51 +0,0 @@ -[all] -localhost ansible_connection=local -{% for s in gitr_enabled_hosts %} -{{ kdevops_host_prefix }}-{{ s }} -{% if kdevops_baseline_and_dev %} -{{ kdevops_host_prefix }}-{{ s }}-dev -{% endif %} -{% endfor %} -[all:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" - -[baseline] -{% for s in gitr_enabled_hosts %} -{{ kdevops_host_prefix }}-{{ s }} -{% endfor %} -[baseline:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" - -[dev] -{% if kdevops_baseline_and_dev %} - {% for s in gitr_enabled_hosts %} -{{ kdevops_host_prefix }}-{{ s }}-dev - {% endfor %} -{% endif %} -[dev:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% if kdevops_enable_iscsi %} - -[iscsi] -{{ kdevops_hosts_prefix }}-iscsi -[iscsi:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} -{% if kdevops_nfsd_enable %} - -[nfsd] -{{ kdevops_hosts_prefix }}-nfsd -[nfsd:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} -{% if kdevops_enable_iscsi or kdevops_nfsd_enable %} -[service] -{% if kdevops_enable_iscsi %} -{{ kdevops_hosts_prefix }}-iscsi -{% endif %} -{% if kdevops_nfsd_enable %} -{{ kdevops_hosts_prefix }}-nfsd -{% endif %} -[service:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} diff --git a/playbooks/roles/gen_hosts/templates/ltp.j2 b/playbooks/roles/gen_hosts/templates/ltp.j2 deleted file mode 100644 index 6946b3f3..00000000 --- a/playbooks/roles/gen_hosts/templates/ltp.j2 +++ /dev/null @@ -1,30 +0,0 @@ -[all] -localhost ansible_connection=local -{% for s in ltp_enabled_hosts %} -{{ kdevops_host_prefix }}-{{ s }} -{% if kdevops_baseline_and_dev %} -{{ kdevops_host_prefix }}-{{ s }}-dev -{% endif %} -{% endfor %} -[all:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" - -[baseline] -{% for s in ltp_enabled_hosts %} -{{ kdevops_host_prefix }}-{{ s }} -{% endfor %} -[baseline:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" - -[dev] -{% if kdevops_baseline_and_dev %} - {% for s in ltp_enabled_hosts %} -{{ kdevops_host_prefix }}-{{ s }}-dev - {% endfor %} -{% endif %} -[dev:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" - -[service] -[service:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/mmtests.j2 b/playbooks/roles/gen_hosts/templates/mmtests.j2 deleted file mode 100644 index 8df4a3c3..00000000 --- a/playbooks/roles/gen_hosts/templates/mmtests.j2 +++ /dev/null @@ -1,36 +0,0 @@ -[all] -localhost ansible_connection=local -{% for test_type in mmtests_enabled_test_types %} -{{ kdevops_host_prefix }}-{{ test_type }} -{% if kdevops_baseline_and_dev %} -{{ kdevops_host_prefix }}-{{ test_type }}-dev -{% endif %} -{% endfor %} -[all:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[baseline] -{% for test_type in mmtests_enabled_test_types %} -{{ kdevops_host_prefix }}-{{ test_type }} -{% endfor %} -[baseline:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[dev] -{% if kdevops_baseline_and_dev %} - {% for test_type in mmtests_enabled_test_types %} -{{ kdevops_host_prefix }}-{{ test_type }}-dev - {% endfor %} -{% endif %} -[dev:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[mmtests] -{% for test_type in mmtests_enabled_test_types %} -{{ kdevops_host_prefix }}-{{ test_type }} -{% if kdevops_baseline_and_dev %} -{{ kdevops_host_prefix }}-{{ test_type }}-dev -{% endif %} -{% endfor %} -[mmtests:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[service] -[service:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/nfstest.j2 b/playbooks/roles/gen_hosts/templates/nfstest.j2 deleted file mode 100644 index 709d871d..00000000 --- a/playbooks/roles/gen_hosts/templates/nfstest.j2 +++ /dev/null @@ -1,51 +0,0 @@ -[all] -localhost ansible_connection=local -{% for s in nfstest_enabled_hosts %} -{{ kdevops_host_prefix }}-{{ s }} -{% if kdevops_baseline_and_dev %} -{{ kdevops_host_prefix }}-{{ s }}-dev -{% endif %} -{% endfor %} -[all:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" - -[baseline] -{% for s in nfstest_enabled_hosts %} -{{ kdevops_host_prefix }}-{{ s }} -{% endfor %} -[baseline:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" - -[dev] -{% if kdevops_baseline_and_dev %} - {% for s in nfstest_enabled_hosts %} -{{ kdevops_host_prefix }}-{{ s }}-dev - {% endfor %} -{% endif %} -[dev:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% if kdevops_enable_iscsi %} - -[iscsi] -{{ kdevops_hosts_prefix }}-iscsi -[iscsi:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} -{% if kdevops_nfsd_enable %} - -[nfsd] -{{ kdevops_hosts_prefix }}-nfsd -[nfsd:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} -{% if kdevops_enable_iscsi or kdevops_nfsd_enable %} -[service] -{% if kdevops_enable_iscsi %} -{{ kdevops_hosts_prefix }}-iscsi -{% endif %} -{% if kdevops_nfsd_enable %} -{{ kdevops_hosts_prefix }}-nfsd -{% endif %} -[service:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} diff --git a/playbooks/roles/gen_hosts/templates/pynfs.j2 b/playbooks/roles/gen_hosts/templates/pynfs.j2 deleted file mode 100644 index 55add4d1..00000000 --- a/playbooks/roles/gen_hosts/templates/pynfs.j2 +++ /dev/null @@ -1,34 +0,0 @@ -[all] -localhost ansible_connection=local -{{ kdevops_hosts_prefix }}-nfsd -[all:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[baseline] -{{ kdevops_hosts_prefix }}-nfsd -[baseline:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[dev] -{% if kdevops_baseline_and_dev %} -{{ kdevops_host_prefix }}-nfsd-dev -{% endif %} -[dev:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% if kdevops_enable_iscsi %} -[iscsi] -{{ kdevops_hosts_prefix }}-iscsi -[iscsi:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} -[nfsd] -{{ kdevops_hosts_prefix }}-nfsd -[nfsd:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% if true %} -[service] -{% if kdevops_enable_iscsi %} -{{ kdevops_hosts_prefix }}-iscsi -{% endif %} -{{ kdevops_hosts_prefix }}-nfsd -[service:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -{% endif %} diff --git a/playbooks/roles/gen_hosts/templates/selftests.j2 b/playbooks/roles/gen_hosts/templates/selftests.j2 deleted file mode 100644 index af0d6b34..00000000 --- a/playbooks/roles/gen_hosts/templates/selftests.j2 +++ /dev/null @@ -1,27 +0,0 @@ -[all] -localhost ansible_connection=local -{% for test_type in selftests_enabled_test_types %} -{{ kdevops_host_prefix }}-{{ test_type }} -{% if kdevops_baseline_and_dev %} -{{ kdevops_host_prefix }}-{{ test_type }}-dev -{% endif %} -{% endfor %} -[all:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[baseline] -{% for test_type in selftests_enabled_test_types %} -{{ kdevops_host_prefix }}-{{ test_type }} -{% endfor %} -[baseline:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[dev] -{% if kdevops_baseline_and_dev %} - {% for test_type in selftests_enabled_test_types %} -{{ kdevops_host_prefix }}-{{ test_type }}-dev - {% endfor %} -{% endif %} -[dev:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[service] -[service:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" diff --git a/playbooks/roles/gen_hosts/templates/sysbench.j2 b/playbooks/roles/gen_hosts/templates/sysbench.j2 deleted file mode 100644 index e30773c1..00000000 --- a/playbooks/roles/gen_hosts/templates/sysbench.j2 +++ /dev/null @@ -1,27 +0,0 @@ -[all] -localhost ansible_connection=local -{% for test_type in enabled_sysbench_tests %} -{{ kdevops_host_prefix }}-{{ test_type }} -{% if kdevops_baseline_and_dev %} -{{ kdevops_host_prefix }}-{{ test_type }}-dev -{% endif %} -{% endfor %} -[all:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[baseline] -{% for test_type in enabled_sysbench_tests %} -{{ kdevops_host_prefix }}-{{ test_type }} -{% endfor %} -[baseline:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[dev] -{% if kdevops_baseline_and_dev %} - {% for test_type in enabled_sysbench_tests %} -{{ kdevops_host_prefix }}-{{ test_type }}-dev - {% endfor %} -{% endif %} -[dev:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -[service] -[service:vars] -ansible_python_interpreter = "{{ kdevops_python_interpreter }}" -- 2.50.1