summaryrefslogtreecommitdiffstats
path: root/xci/playbooks/roles/create-nodes/tasks/barematalhoststojson.yml
diff options
context:
space:
mode:
Diffstat (limited to 'xci/playbooks/roles/create-nodes/tasks/barematalhoststojson.yml')
-rw-r--r--xci/playbooks/roles/create-nodes/tasks/barematalhoststojson.yml13
1 files changed, 8 insertions, 5 deletions
diff --git a/xci/playbooks/roles/create-nodes/tasks/barematalhoststojson.yml b/xci/playbooks/roles/create-nodes/tasks/barematalhoststojson.yml
index c067781f..8aeea321 100644
--- a/xci/playbooks/roles/create-nodes/tasks/barematalhoststojson.yml
+++ b/xci/playbooks/roles/create-nodes/tasks/barematalhoststojson.yml
@@ -29,11 +29,14 @@
block:
- set_fact:
+ node_name: "{{ ('kubespray' in installer_type) | ternary(idf.kubespray.hostnames[item.name], idf.osa.hostnames[item.name]) }}"
+
+ - set_fact:
host_group: "{{ node_default_groups }}"
- set_fact:
- host_group: "{{ node_default_groups | union(node_groups[item.name]) }}"
- when: node_groups[item.name] is defined
+ host_group: "{{ node_default_groups | union(node_groups[node_name]) }}"
+ when: node_groups[node_name] is defined
- name: BAREMETAL - Fetch the ip
set_fact:
@@ -46,8 +49,8 @@
- name: BAREMETAL - set the json entry for baremetal nodes
set_fact:
node_data:
- name: "{{ item.name }}"
- uuid: "{{ item.name | to_uuid }}"
+ name: "{{ node_name }}"
+ uuid: "{{ node_name | to_uuid }}"
host_groups: "{{ host_group }}"
driver: "ipmi"
driver_info:
@@ -74,6 +77,6 @@
- name: BAREMETAL - add created node info
set_fact:
- nodes_json_data: "{{ nodes_json_data | combine({item.name: node_data}) }}"
+ nodes_json_data: "{{ nodes_json_data | combine({node_name: node_data}) }}"
when: (num_nodes | int) > (nodes_json_data | length | int) + 1