Merge pull request #680 from mcornea/autoconfigure_interface_vars

PERFSCALE-4093: Auto configure network interfaces vars

Author: openshift-merge-bot[bot]

ansible/roles/create-inventory/tasks/main.yml

@@ -52,13 +52,25 @@
     validate_certs: false
   register: bastion_foreman_data
 
+- name: Determine machine type for automatic interface configuration
+  set_fact:
+    machine_type: "{{ (ocpinventory.json.nodes[0].pm_addr.split('.')[0]).split('-')[-1] }}"
+
 - name: Public VLAN autoconfiguration
   when: public_vlan
   block:
   - name: Public VLAN - Set controlplane_network_interface_idx to -1 for the last interface
     set_fact:
       controlplane_network_interface_idx: "-1"
 
+  - name: Public VLAN - Update bastion_controlplane_interface to use last interface
+    set_fact:
+      bastion_controlplane_interface: "{{ hw_nic_name[lab][machine_type][-1] }}"
+    when:
+      - bastion_controlplane_interface is not defined
+      - lab in hw_nic_name
+      - machine_type in hw_nic_name[lab]
+
   - name: Public VLAN - Get assignment from quads
     uri:
       url: "https://{{ labs[lab]['quads'] }}/api/v3/assignments/active/{{ lab_cloud }}"
@@ -79,6 +91,31 @@
       cluster_name: "vlan{{ quads_assignment.json.vlan.vlan_id }}"
     when: cluster_name == "mno"
 
+- name: Auto-configure bastion lab interface (only when not explicitly set)
+  set_fact:
+    bastion_lab_interface: "{{ hw_nic_name[lab][machine_type][0] }}"
+  when:
+    - bastion_lab_interface is not defined
+    - lab in hw_nic_name
+    - machine_type in hw_nic_name[lab]
+
+- name: Auto-configure bastion controlplane interface (only when not explicitly set)
+  set_fact:
+    bastion_controlplane_interface: "{{ hw_nic_name[lab][machine_type][controlplane_network_interface_idx|int+1] }}"
+  when:
+    - bastion_controlplane_interface is not defined
+    - lab in hw_nic_name
+    - machine_type in hw_nic_name[lab]
+    - not public_vlan
+
+- name: Auto-configure controlplane lab interface (only when not explicitly set)
+  set_fact:
+    controlplane_lab_interface: "{{ hw_nic_name[lab][machine_type][0] }}"
+  when:
+    - controlplane_lab_interface is not defined
+    - lab in hw_nic_name
+    - machine_type in hw_nic_name[lab]
+
 - name: Multi node cluster type tasks
   when: cluster_type == "mno"
   block:
@@ -294,6 +331,32 @@
     loop_control:
       index_var: idx
 
+- name: Validate network interface variables are properly configured
+  block:
+  - name: Validate bastion_lab_interface is defined
+    assert:
+      that:
+        - bastion_lab_interface is defined
+        - bastion_lab_interface != ""
+      fail_msg: "bastion_lab_interface is not properly configured. Check your all.yml configuration or verify lab/machine_type support in lab.yml"
+      success_msg: "bastion_lab_interface is configured: {{ bastion_lab_interface }}"
+
+  - name: Validate bastion_controlplane_interface is defined
+    assert:
+      that:
+        - bastion_controlplane_interface is defined
+        - bastion_controlplane_interface != ""
+      fail_msg: "bastion_controlplane_interface is not properly configured. Check your all.yml configuration or verify lab/machine_type support in lab.yml"
+      success_msg: "bastion_controlplane_interface is configured: {{ bastion_controlplane_interface }}"
+
+  - name: Validate controlplane_lab_interface is defined
+    assert:
+      that:
+        - controlplane_lab_interface is defined
+        - controlplane_lab_interface != ""
+      fail_msg: "controlplane_lab_interface is not properly configured. Check your all.yml configuration or verify lab/machine_type support in lab.yml"
+      success_msg: "controlplane_lab_interface is configured: {{ controlplane_lab_interface }}"
+
 - name: Place inventory file named {{ lab_cloud }}.local into inventory directory
   template:
     src: "inventory-{{ cluster_type }}.j2"

ansible/roles/create-inventory/templates/inventory-mno.j2

@@ -9,6 +9,10 @@ base_dns_name={{ labs[lab]['base_dns_name'] }}
 {% else %}
 base_dns_name={{ base_dns_name }}
 {% endif %}
+# Network interface configuration
+bastion_lab_interface={{ bastion_lab_interface }}
+bastion_controlplane_interface={{ bastion_controlplane_interface }}
+controlplane_lab_interface={{ controlplane_lab_interface }}
 
 [bastion]
 {{ bastion_machine }} ansible_ssh_user=root bmc_address=mgmt-{{ bastion_machine }} lab_ip={{ bastion_foreman_data.json.ip }}

ansible/roles/create-inventory/templates/inventory-sno.j2

@@ -14,6 +14,10 @@ base_dns_name={{ labs[lab]['base_dns_name'] }}
 {% else %}
 base_dns_name={{ base_dns_name }}
 {% endif %}
+# Network interface configuration
+bastion_lab_interface={{ bastion_lab_interface }}
+bastion_controlplane_interface={{ bastion_controlplane_interface }}
+controlplane_lab_interface={{ controlplane_lab_interface }}
 
 [bastion]
 {{ bastion_machine }} ansible_ssh_user=root bmc_address=mgmt-{{ bastion_machine }} lab_ip={{ bastion_foreman_data.json.ip }}

ansible/roles/create-inventory/templates/inventory-vmno.j2

@@ -9,6 +9,10 @@ base_dns_name={{ labs[lab]['base_dns_name'] }}
 {% else %}
 base_dns_name={{ base_dns_name }}
 {% endif %}
+# Network interface configuration
+bastion_lab_interface={{ bastion_lab_interface }}
+bastion_controlplane_interface={{ bastion_controlplane_interface }}
+controlplane_lab_interface={{ controlplane_lab_interface }}
 
 [bastion]
 {{ bastion_machine }} ansible_ssh_user=root bmc_address=mgmt-{{ bastion_machine }} lab_ip={{ bastion_foreman_data.json.ip }}

ansible/vars/all.sample.yml

@@ -54,8 +54,10 @@ bastion_cluster_config_dir: /root/{{ cluster_type }}
 
 smcipmitool_url:
 
-bastion_lab_interface: eno1np0
-bastion_controlplane_interface: ens1f0
+# Network interfaces - these will be auto-configured based on lab and machine type
+# if not explicitly set. To override auto-configuration, uncomment and set values:
+# bastion_lab_interface: eno1np0
+# bastion_controlplane_interface: ens1f0
 
 # Sets up Gogs a self-hosted git service on the bastion
 setup_bastion_gogs: false
@@ -70,7 +72,9 @@ use_bastion_registry: false
 # OCP node vars
 ################################################################################
 # Network configuration for all mno/sno cluster nodes
-controlplane_lab_interface: eno1np0
+# This will be auto-configured based on lab and machine type if not explicitly set
+# To override auto-configuration, uncomment and set value:
+# controlplane_lab_interface: eno1np0
 
 ################################################################################
 # Extra vars

docs/tips-and-vars.md

@@ -17,6 +17,7 @@ _**Table of Contents**_
 ## Network interface to vars table
 
 Values here reflect the default (Network 1 which maps to `controlplane_network_interface_idx: 0`). See this [section](#using-other-network-interfaces) to generate the proper inventory for a different network.
+Note that if these variables are not explicitely set then Jetlag auto configures them.
 
 **Scale Lab**