Add support for the hardware type 'r640' that belongs to different racks

common.yml

@@ -9,6 +9,9 @@
       - name: load instackenv file
         include_tasks: tasks/load_instackenv.yml
 
+      - name: load ocpinventory file
+        include_tasks: tasks/load_ocpinventory.yml
+
       - name: get tn10rt machines list
         shell: curl http://wiki.scalelab.redhat.com/1029u/ > ~/tn10rt.html
 

composable_prepare_nic_configs.yml

@@ -75,6 +75,20 @@
           lab_vars: "{{ (lab_name == 'scale') | ternary(scale, alias) }}"
         when: lab_name in ['scale', 'alias'] and osp_release|int >= 17
 
+      - name: generic interface names for r640
+        set_fact:
+          machine_ifaces: "{{ machine_ifaces | combine(update_item) }}"
+        vars:
+          update_item: "{ 'r640': {{ ['nic1', 'nic2', 'nic3', 'nic4'] }} }"
+        when: lab_name == "scale" and osp_release|int >= 17
+
+      - name: generic interface names for r640
+        set_fact:
+          machine_ifaces: "{{ machine_ifaces | combine(update_item) }}"
+        vars:
+          update_item: "{ 'r640': {{ ['nic2', 'nic1', 'nic3', 'nic4'] }} }"
+        when: lab_name == "alias" and osp_release|int >= 17
+
       - name: set interfaces
         set_fact:
           ifaces: "{{ ifaces|default([]) + [ machine_ifaces[item]] }}"

tasks/load_ocpinventory.yml

@@ -0,0 +1,30 @@
+# ocpinventory.json for MAC addresses
+---
+- name: Download ocpinventory.json
+  get_url:
+      url: "{{ alias.lab_url }}/cloud/{{ cloud_name }}_ocpinventory.json"
+      dest: ~/
+      mode: '0644'
+      force: yes
+  when: lab_name == "alias"
+
+- name: Download ocpinventory.json
+  get_url:
+      url: "{{ scale.lab_url }}/cloud/{{ cloud_name }}_ocpinventory.json"
+      dest: ~/
+      mode: '0644'
+      force: yes
+  when: lab_name == "scale"
+
+- name: set fact for ocpinventory file
+  set_fact:
+    ocpinventory_file: "~/{{ cloud_name }}_ocpinventory.json"
+
+- name: load ocpinventory data
+  slurp:
+    src: "{{ ocpinventory_file }}"
+  register: ocpinventory_data
+
+- name: read ocpinventory file
+  set_fact:
+    ocpinventory_content: "{{ ocpinventory_data['content'] | b64decode | from_json }}"

templates/baremetal_deployment.yaml.j2

@@ -75,6 +75,18 @@
   defaults:
     profile: baremetal{{ node_type }}
     network_config:
+{# workaround for r640's that has different interface namings #}
+{% if node_type|string() == "r640" %}
+      net_config_data_lookup:
+{% for i in range(0, ocpinventory_content.nodes | length) %}
+{% if node_type|string() in ocpinventory_content.nodes[i].pm_addr|string() %}
+        node{{ i|int + 1 }}:
+{% for j in range(0, ocpinventory_content.nodes[i].mac | length) %}
+          nic{{ j|int + 1 }}: "{{ ocpinventory_content.nodes[i].mac[j] }}"
+{% endfor %}
+{% endif %}
+{% endfor %}
+{% endif %}
       template: /home/stack/virt/network/vlans/compute_{{ node_type }}.j2
     networks:
     - network: ctlplane