diff mbox series

[2/6] gen_nodes: Fix generation of the list of test nodes

Message ID 20241210192920.682914-3-cel@kernel.org (mailing list archive)
State New
Headers show
Series Recent fixes | expand

Commit Message

Chuck Lever Dec. 10, 2024, 7:29 p.m. UTC 
From: Chuck Lever <chuck.lever@oracle.com>

Terraform was getting an incorrect list of instances to create. The
new workflows I added got the node list generation wrong.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 playbooks/roles/gen_nodes/tasks/gitr.yml    | 4 ++--
 playbooks/roles/gen_nodes/tasks/ltp.yml     | 4 ++--
 playbooks/roles/gen_nodes/tasks/nfstest.yml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/playbooks/roles/gen_nodes/tasks/gitr.yml b/playbooks/roles/gen_nodes/tasks/gitr.yml
index 717a6377d431..4083336f687b 100644
--- a/playbooks/roles/gen_nodes/tasks/gitr.yml
+++ b/playbooks/roles/gen_nodes/tasks/gitr.yml
@@ -25,8 +25,8 @@ 
 - name: Generate the kdevops nodes file using {{ kdevops_nodes_template }}
   vars:
     node_template: "{{ kdevops_nodes_template | basename }}"
-    all_generic_nodes: "{{ generic_nodes }}"
-    nodes: "{{ [kdevops_host_prefix + '-'] | product(gitr_enabled_nodes) | map('join') | list }}"
+    all_generic_nodes: "{{ [kdevops_host_prefix + '-'] | product(gitr_enabled_nodes) | map('join') | list }}"
+    nodes: "{{ all_generic_nodes }}"
   ansible.builtin.template:
     src: "{{ node_template }}"
     dest: "{{ topdir_path }}/{{ kdevops_nodes }}"
diff --git a/playbooks/roles/gen_nodes/tasks/ltp.yml b/playbooks/roles/gen_nodes/tasks/ltp.yml
index 711f843838f6..118a2d82626d 100644
--- a/playbooks/roles/gen_nodes/tasks/ltp.yml
+++ b/playbooks/roles/gen_nodes/tasks/ltp.yml
@@ -13,8 +13,8 @@ 
 - name: Generate the kdevops nodes file using {{ kdevops_nodes_template }}
   vars:
     node_template: "{{ kdevops_nodes_template | basename }}"
-    all_generic_nodes: "{{ generic_nodes }}"
-    nodes: "{{ [kdevops_host_prefix + '-'] | product(ltp_enabled_nodes) | map('join') | list }}"
+    all_generic_nodes: "{{ [kdevops_host_prefix + '-'] | product(ltp_enabled_nodes) | map('join') | list }}"
+    nodes: "{{ all_generic_nodes }}"
   ansible.builtin.template:
     src: "{{ node_template }}"
     dest: "{{ topdir_path }}/{{ kdevops_nodes }}"
diff --git a/playbooks/roles/gen_nodes/tasks/nfstest.yml b/playbooks/roles/gen_nodes/tasks/nfstest.yml
index 13bc96b06d6b..6c6c99eec43e 100644
--- a/playbooks/roles/gen_nodes/tasks/nfstest.yml
+++ b/playbooks/roles/gen_nodes/tasks/nfstest.yml
@@ -25,8 +25,8 @@ 
 - name: Generate the kdevops nodes file using {{ kdevops_nodes_template }}
   vars:
     node_template: "{{ kdevops_nodes_template | basename }}"
-    all_generic_nodes: "{{ generic_nodes }}"
-    nodes: "{{ [kdevops_host_prefix + '-'] | product(nfstest_enabled_nodes) | map('join') | list }}"
+    all_generic_nodes: "{{ [kdevops_host_prefix + '-'] | product(nfstest_enabled_nodes) | map('join') | list }}"
+    nodes: "{{ all_generic_nodes }}"
   ansible.builtin.template:
     src: "{{ node_template }}"
     dest: "{{ topdir_path }}/{{ kdevops_nodes }}"