review comments

Author: haseebsyed12

ansible/playbooks/openstack_baremetal.yaml

@@ -27,3 +27,4 @@
 
   roles:
     - role: openstack_network
+    - role: openstack_baremetal

ansible/playbooks/openstack_network.yaml renamed to ansible/playbooks/openstack_infra.yaml

@@ -0,0 +1,9 @@
+---
+
+- name: Create neutron port for network {{ port_info.neutron_network }}
+  openstack.cloud.port:
+    state: present
+    name: "{{ port_info.neutron_name }}"
+    mac_address: "{{ port_info.mac }}"
+    network: "{{ port_info.neutron_network }}"
+  when: port_info.neutron_name is defined

ansible/roles/openstack_baremetal/tasks/port.yml renamed to ansible/roles/openstack_baremetal/tasks/baremetal_port.yml

@@ -1,26 +1,51 @@
 ---
 
+- name: Extract MAC addresses
+  ansible.builtin.set_fact:
+    node_mac_addresses: >-
+      {{
+        item.port_info
+        | map(attribute='port')
+        | map(attribute='mac')
+        | map('community.general.dict_kv', 'mac')
+        | list
+      }}
+
 - name: Enroll infra node {{ item.name }}
   openstack.cloud.baremetal_node:
     name: "{{ item.name }}"
     driver: "{{ item.driver }}"
     driver_info: "{{ item.driver_info }}"
-    nics: "{{ item.nics }}"
+    nics: "{{ node_mac_addresses }}"
     state: present
   register: enrolled_node
 
+
+- name: Create baremetal port group for node {{ item.name }}
+  ansible.builtin.include_tasks: port_group.yml
+  loop: "{{ port_groups }}"
+  loop_control:
+    loop_var: port_group
+  vars:
+    node_id: "{{ enrolled_node.node.id }}"
+    port_groups: >-
+      {{
+        item.port_info
+        | map(attribute='port_group')
+        | select('defined')
+        | list
+      }}
+
 - name: Create baremetal ports for node {{ item.name }}
-  ansible.builtin.include_tasks: port.yml
-  loop: "{{ item.nics }}"
+  ansible.builtin.include_tasks: baremetal_port.yml
+  loop: "{{ node_mac_addresses }}"
   loop_control:
     loop_var: port_info
   vars:
     port_node_name: "{{ item.name }}"
 
-- name: Create baremetal ports group for node {{ item.name }}
-  ansible.builtin.include_tasks: port_group.yml
-  loop: "{{ item.port_groups }}"
+- name: Create neutron ports
+  ansible.builtin.include_tasks: neutron_port.yml
+  loop: "{{ item.port_info }}"
   loop_control:
-    loop_var: port_group
-  vars:
-    node_id: "{{ enrolled_node.node.id }}"
+    loop_var: port_info

ansible/roles/openstack_baremetal/tasks/neutron_port.yml

@@ -18,14 +18,6 @@
   loop_control:
     label: "{{ item.item.network_name }}"
 
-- name: Create segment range
-  ansible.builtin.include_tasks: segment_range.yml
-  loop: "{{ network_segment_ranges }}"
-  loop_control:
-    loop_var: segment
-  vars:
-    item: "{{ segment }}"
-
 - name: Create subnet pool
   ansible.builtin.include_tasks: subnet_pool.yml
   loop: "{{ subnet_pools }}"
@@ -34,11 +26,20 @@
   vars:
     item: "{{ subnet_pool }}"
 
-- name: Create baremetal ports
-  ansible.builtin.include_tasks: port.yml
-  loop: "{{ baremetal_ports }}"
+- name: Create fabric segment range
+  ansible.builtin.include_tasks: segment_range.yml
+  vars:
+    item: "{{ fabric_network_segment_range }}"
+
+- name: Create segment range
+  ansible.builtin.include_tasks: segment_range.yml
+  loop: "{{ network_segment_ranges.physical_networks }}"
   loop_control:
-    loop_var: network_ports
+    loop_var: physical_network
   vars:
-    ports: "{{ network_ports.ports }}"
-    network: "{{ network_ports.network }}"
+    item:
+      name: "{{ physical_network }}"
+      range_min: "{{ network_segment_ranges.range_min }}"
+      range_max: "{{ network_segment_ranges.range_max }}"
+      network_type: "{{ network_segment_ranges.network_type }}"
+      physical_network: "{{ physical_network }}"

ansible/roles/openstack_baremetal/tasks/node.yml

@@ -10,11 +10,11 @@
   ansible.builtin.shell: >
     openstack network segment range create
     --shared
-    --network-type {{ item['network-type'] }}
+    --network-type {{ item.network_type }}
     --minimum {{ item.range_min }}
     --maximum {{ item.range_max }}
-    {% if item.get('physical-network', '') | length > 0 %}
-    --physical-network {{ item['physical-network'] }}
+    {% if item.physical_network is defined %}
+    --physical-network {{ item.physical_network }}
     {% endif %}
     {{ item.name }}
   when: segment_range_check.rc != 0