gen_nodes: Fix generation of the list of test nodes

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

Reviewed-by: Luis Chamberlain <[email protected]>
Signed-off-by: Chuck Lever <[email protected]>

Author: chucklever

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 }}"

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 }}"

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 }}"