From 8b528ed84aac3c8ff70611b892900df8aa2beb96 Mon Sep 17 00:00:00 2001
From: Raul Sevilla <rsevilla@redhat.com>
Date: Wed, 18 Sep 2024 00:14:24 +0200
Subject: [PATCH 01/10] Public VLAN improvements

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
---
 ansible/roles/create-inventory/tasks/main.yml |  5 +++
 .../templates/inventory-mno.j2                | 11 ++++-
 ansible/vars/all.sample.yml                   |  4 +-
 docs/deploy-mno-performancelab.md             | 31 +++++++++++---
 docs/deploy-mno-scalelab.md                   | 41 ++++++++++++++-----
 5 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/ansible/roles/create-inventory/tasks/main.yml b/ansible/roles/create-inventory/tasks/main.yml
index 8bb05093..9260e9c4 100644
--- a/ansible/roles/create-inventory/tasks/main.yml
+++ b/ansible/roles/create-inventory/tasks/main.yml
@@ -47,6 +47,11 @@
     ocpinventory_sno_nodes: []
     ocpinventory_hv_nodes: []
 
+- name: Public VLAN - Configuring controlplane_network_interface_idx to the last interface
+  set_fact:
+    controlplane_network_interface_idx: "{{ ocpinventory.json.nodes[0].network.interfaces[0].mac | length - 1 }}"
+  when: public_vlan and cluster_type == "bm"
+
 - name: Bare metal cluster and remote worker node cluster type tasks
   when: cluster_type == "mno" or cluster_type == "rwn"
   block:
diff --git a/ansible/roles/create-inventory/templates/inventory-mno.j2 b/ansible/roles/create-inventory/templates/inventory-mno.j2
index 677d8565..72b4bea1 100644
--- a/ansible/roles/create-inventory/templates/inventory-mno.j2
+++ b/ansible/roles/create-inventory/templates/inventory-mno.j2
@@ -1,6 +1,15 @@
 [all:vars]
 allocation_node_count={{ ocpinventory.json.nodes | length }}
 supermicro_nodes={{ has_supermicro | bool }}
+{% if public_vlan %}
+{% if lab_name == "scalelab" %}
+base_dns_name=rdu2.scalelab.redhat.com
+{% elif lab_name == "performancelab" %}
+base_dns_name=rdu3.labs.perfscale.redhat.com
+{% else %}
+base_dns_name=example.com
+{% endif %}
+{% endif %}
 
 [bastion]
 {{ bastion_machine }} ansible_ssh_user=root bmc_address=mgmt-{{ bastion_machine }}
@@ -32,7 +41,7 @@ dns2={{ labs[lab]['dns'][1] | default('') }}
 
 [worker]
 {% for worker in ocpinventory_worker_nodes %}
-{{ worker.pm_addr.split('.')[0] | replace('mgmt-','') }} bmc_address={{ worker.pm_addr }} network_mac={{ worker.mac[controlplane_network_interface_idx] }} lab_mac={{ ( (mno_foreman_data.results| selectattr('json.name', 'eq', worker.pm_addr | replace('mgmt-',''))|first).json.interfaces | selectattr('primary', 'eq', True)|first).mac }} ip={{ controlplane_network | ansible.utils.nthhost(loop.index + mno_worker_node_offset) }} vendor={{ hw_vendor[(worker.pm_addr.split('.')[0]).split('-')[-1]] }} install_disk={{ worker_install_disk }}
+{{ worker.pm_addr.split('.')[0] | replace('mgmt-','') }} bmc_address={{ worker.pm_addr }} network_mac={{ worker.mac[controlplane_network_interface_idx|int] }} lab_mac={{ ( (mno_foreman_data.results| selectattr('json.name', 'eq', worker.pm_addr | replace('mgmt-',''))|first).json.interfaces | selectattr('primary', 'eq', True)|first).mac }} ip={{ controlplane_network | ansible.utils.nthhost(loop.index + mno_worker_node_offset) }} vendor={{ hw_vendor[(worker.pm_addr.split('.')[0]).split('-')[-1]] }} install_disk={{ worker_install_disk }}
 {% endfor %}
 
 [worker:vars]
diff --git a/ansible/vars/all.sample.yml b/ansible/vars/all.sample.yml
index 94507c9b..08413d55 100644
--- a/ansible/vars/all.sample.yml
+++ b/ansible/vars/all.sample.yml
@@ -31,10 +31,12 @@ ocp_version: "latest-4.16"
 # Either "OVNKubernetes" or "OpenShiftSDN" (Only for MNO/RWN cluster types)
 networktype: OVNKubernetes
 
-# Lab Network type, applies to sno cluster_type only
+# Lab Network type, applies to sno and bm cluster_type only
 # Set this variable if you want to host your SNO cluster on lab public routable
 # VLAN network, set this ONLY if you have public routable VLAN enabled in your
 # scalelab cloud
+# For bm clusters, enable this variable to autoconfigure controlplane_network_interface_idx and
+# base_dns_name to the according values
 public_vlan: false
 
 # Enables FIPs security standard
diff --git a/docs/deploy-mno-performancelab.md b/docs/deploy-mno-performancelab.md
index 8fa933f0..1a870b51 100644
--- a/docs/deploy-mno-performancelab.md
+++ b/docs/deploy-mno-performancelab.md
@@ -6,11 +6,18 @@ Assuming you received an Performance lab allocation named `cloud99`, this guide
 _**Table of Contents**_
 
 <!-- TOC -->
-- [Bastion setup](#bastion-setup)
-- [Configure Ansible vars in `all.yml`](#configure-ansible-vars-in-allyml)
-- [Review vars all.yml](#review-vars-allyml)
-- [Run playbooks](#run-playbooks)
-- [Monitor install and interact with cluster](#monitor-install-and-interact-with-cluster)
+- [Deploy a Bare Metal cluster via Jetlag from a Performance Lab Bastion Machine quickstart](#deploy-a-bare-metal-cluster-via-jetlag-from-a-performance-lab-bastion-machine-quickstart)
+  - [Bastion setup](#bastion-setup)
+  - [Configure Ansible vars in `all.yml`](#configure-ansible-vars-in-allyml)
+    - [Lab \& cluster infrastructure vars](#lab--cluster-infrastructure-vars)
+    - [Bastion node vars](#bastion-node-vars)
+    - [OCP node vars](#ocp-node-vars)
+    - [Deploy in the public VLAN](#deploy-in-the-public-vlan)
+    - [Extra vars](#extra-vars)
+    - [Disconnected and ipv6 vars](#disconnected-and-ipv6-vars)
+  - [Review vars `all.yml`](#review-vars-allyml)
+  - [Run playbooks](#run-playbooks)
+  - [Monitor install and interact with cluster](#monitor-install-and-interact-with-cluster)
 <!-- /TOC -->
 
 <!-- Bastion setup is duplicated in multiple files and should be kept in sync!
@@ -277,6 +284,16 @@ controlplane_lab_interface: eno8303
 
 ** If your machine types are not homogeneous, then you will have to manually edit your generated inventory file to correct any nic names until this is reasonably automated.
 
+### Deploy in the public VLAN
+
+In order to deploy in the public VLAN, some variables need to be configured:
+
+- `public_vlan`: Enable this variable **before creating the inventory**, to let jetlag to auto-configure the interface number (`controlplane_network_interface_idx`) to the last of the available NICs of the ocpinventory.json file, when this variable is configured, `base_dns_name` is set to `rdu2.scalelab.redhat.com` in the inventory file.
+- `cluster_name`: Should be configured to the public VLAN name. i.e: `vlan600`, check the public VLANs allocation info in the [scalelab's wiki](https://wiki.rdu3.labs.perfscale.redhat.com/vlans/)
+- `controlplane_network`, `network_prefix` and `gateway` also need to be configured to its corresponding values.
+
+Once the deployment is completed, the cluster API and routes should be reachable directly from the VPN.
+
 ### Extra vars
 
 For multi node deployment of OCP 4.13 or later, it's advisable to configure the following extra variables.
@@ -327,10 +344,12 @@ cluster_type: mno
 # Applies to both mno/rwn clusters
 worker_node_count: 2
 
-# Lab Network type, applies to sno cluster_type only
+# Lab Network type, applies to sno and bm cluster_type only
 # Set this variable if you want to host your SNO cluster on lab public routable
 # VLAN network, set this ONLY if you have public routable VLAN enabled in your
 # Red Hat cloud
+# For bm clusters, enable this variable to autoconfigure controlplane_network_interface_idx and
+# base_dns_name to the according values
 public_vlan: false
 
 # Enter whether the build should use 'dev' (early candidate builds) or 'ga' for Generally Available versions of OpenShift
diff --git a/docs/deploy-mno-scalelab.md b/docs/deploy-mno-scalelab.md
index 73dd80e5..0cde73f7 100644
--- a/docs/deploy-mno-scalelab.md
+++ b/docs/deploy-mno-scalelab.md
@@ -6,11 +6,18 @@ Assuming you received a scale lab allocation named `cloud99`, this guide will wa
 _**Table of Contents**_
 
 <!-- TOC -->
-- [Bastion setup](#bastion-setup)
-- [Configure Ansible vars in `all.yml`](#configure-ansible-vars-in-allyml)
-- [Review vars all.yml](#review-vars-allyml)
-- [Run playbooks](#run-playbooks)
-- [Monitor install and interact with cluster](#monitor-install-and-interact-with-cluster)
+- [Deploy a Multi Node OpenShift cluster via Jetlag from a Scale Lab Bastion Machine quickstart](#deploy-a-multi-node-openshift-cluster-via-jetlag-from-a-scale-lab-bastion-machine-quickstart)
+  - [Bastion setup](#bastion-setup)
+  - [Configure Ansible vars in `all.yml`](#configure-ansible-vars-in-allyml)
+    - [Lab \& cluster infrastructure vars](#lab--cluster-infrastructure-vars)
+    - [Bastion node vars](#bastion-node-vars)
+    - [OCP node vars](#ocp-node-vars)
+    - [Deploy in the public VLAN](#deploy-in-the-public-vlan)
+    - [Extra vars](#extra-vars)
+    - [Disconnected and ipv6 vars](#disconnected-and-ipv6-vars)
+  - [Review vars `all.yml`](#review-vars-allyml)
+  - [Run playbooks](#run-playbooks)
+  - [Monitor install and interact with cluster](#monitor-install-and-interact-with-cluster)
 <!-- /TOC -->
 
 <!-- Bastion setup is duplicated in multiple files and should be kept in sync!
@@ -275,6 +282,16 @@ controlplane_lab_interface: eno12399np0
 
 ** If your machine types are not homogeneous, then you will have to manually edit your generated inventory file to correct any nic names until this is reasonably automated.
 
+### Deploy in the public VLAN
+
+In order to deploy in the public VLAN, some variables need to be configured:
+
+- `public_vlan`: Enable this variable **before creating the inventory**, to let jetlag to auto-configure the interface number (`controlplane_network_interface_idx`) to the last of the available NICs of the ocpinventory.json file, when this variable is configured, `base_dns_name` is set to `rdu2.scalelab.redhat.com` in the inventory file.
+- `cluster_name`: Should be configured to the public VLAN name. i.e: `vlan600`, check the public VLANs allocation info in the [scalelab's wiki](https://wiki.rdu2.scalelab.redhat.com/vlans/)
+- `controlplane_network`, `network_prefix` and `gateway` also need to be configured to its corresponding values.
+
+Once the deployment is completed, the cluster API and routes should be reachable directly from the VPN.
+
 ### Extra vars
 
 For multi node deployment of OCP 4.13 or later, it's advisable to configure the following extra variables.
@@ -324,6 +341,14 @@ cluster_type: mno
 # Applies to both mno/rwn clusters
 worker_node_count: 0
 
+# Lab Network type, applies to sno and bm cluster_type only
+# Set this variable if you want to host your SNO cluster on lab public routable
+# VLAN network, set this ONLY if you have public routable VLAN enabled in your
+# Red Hat cloud
+# For bm clusters, enable this variable to autoconfigure controlplane_network_interface_idx and
+# base_dns_name to the according values
+public_vlan: false
+
 # Enter whether the build should use 'dev' (early candidate builds) or 'ga' for Generally Available versions of OpenShift
 # Empty value results in playbook failing with error message. Example of dev builds would be 'candidate-4.17', 'candidate-4.16'
 # or 'latest' (which would point to the early candidate build of the latest in development release) and examples of 'ga' builds would
@@ -341,12 +366,6 @@ ocp_version: "latest-4.16"
 # Either "OVNKubernetes" or "OpenShiftSDN" (Only for MNO/RWN cluster types)
 networktype: OVNKubernetes
 
-# Lab Network type, applies to sno cluster_type only
-# Set this variable if you want to host your SNO cluster on lab public routable
-# VLAN network, set this ONLY if you have public routable VLAN enabled in your
-# scalelab cloud
-public_vlan: false
-
 ssh_private_key_file: ~/.ssh/id_rsa
 ssh_public_key_file: ~/.ssh/id_rsa.pub
 # Place your pull_secret.txt in the base directory of the cloned Jetlag repo, Example:

From 669a9449f57c591059a768df3a5f5bd6c892898d Mon Sep 17 00:00:00 2001
From: Raul Sevilla <rsevilla@redhat.com>
Date: Thu, 19 Sep 2024 13:30:01 +0200
Subject: [PATCH 02/10] Fix controlplane_network_interface_idx expression

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
---
 ansible/roles/create-inventory/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/create-inventory/tasks/main.yml b/ansible/roles/create-inventory/tasks/main.yml
index 9260e9c4..e494f3f5 100644
--- a/ansible/roles/create-inventory/tasks/main.yml
+++ b/ansible/roles/create-inventory/tasks/main.yml
@@ -49,7 +49,7 @@
 
 - name: Public VLAN - Configuring controlplane_network_interface_idx to the last interface
   set_fact:
-    controlplane_network_interface_idx: "{{ ocpinventory.json.nodes[0].network.interfaces[0].mac | length - 1 }}"
+    controlplane_network_interface_idx: "{{ ocpinventory.json.nodes[0].mac | length - 1 }}"
   when: public_vlan and cluster_type == "bm"
 
 - name: Bare metal cluster and remote worker node cluster type tasks

From 6f7bd669b4081a47fe17e93d21c3c08ee84c35ae Mon Sep 17 00:00:00 2001
From: Raul Sevilla <rsevilla@redhat.com>
Date: Thu, 19 Sep 2024 23:01:17 +0200
Subject: [PATCH 03/10] Discover VLAN settings from quads APi

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
---
 ansible/roles/create-inventory/tasks/main.yml | 24 ++++++++++++++++---
 docs/deploy-mno-performancelab.md             |  1 -
 docs/deploy-mno-scalelab.md                   |  1 -
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/create-inventory/tasks/main.yml b/ansible/roles/create-inventory/tasks/main.yml
index e494f3f5..4669f96a 100644
--- a/ansible/roles/create-inventory/tasks/main.yml
+++ b/ansible/roles/create-inventory/tasks/main.yml
@@ -47,10 +47,28 @@
     ocpinventory_sno_nodes: []
     ocpinventory_hv_nodes: []
 
-- name: Public VLAN - Configuring controlplane_network_interface_idx to the last interface
-  set_fact:
-    controlplane_network_interface_idx: "{{ ocpinventory.json.nodes[0].mac | length - 1 }}"
+- name: Public VLAN in BM cluster
   when: public_vlan and cluster_type == "bm"
+  block:
+  - name: Public VLAN - Configuring controlplane_network_interface_idx to the last interface
+    set_fact:
+      controlplane_network_interface_idx: "{{ ocpinventory.json.nodes[0].mac | length - 1 }}"
+
+  - name: Get assignment from quads
+    uri:
+      url: "https://{{ labs[lab]['quads'] }}/api/v1/assignments/active/{{ lab_cloud}}/"
+      force_basic_auth: yes
+      user: "{{ lab_cloud }}"
+      password: "{{ ocpinventory.json.nodes[0].pm_password }}"
+      validate_certs: false
+    register: quads_assignment
+
+  - name: Public VLAN - Set addressing information
+    set_fact:
+      controlplane_network: "{{ quads_assignment.json.vlan.address }}"
+      network_prefix: "{{ quads_assignment.json.vlan.prefix }}"
+      gateway: "{{ quads_assignment.json.vlan.gateway }}"
+      cluster_name: "vlan{{ quads_assignment.json.vlan.vlan_id }}"
 
 - name: Bare metal cluster and remote worker node cluster type tasks
   when: cluster_type == "mno" or cluster_type == "rwn"
diff --git a/docs/deploy-mno-performancelab.md b/docs/deploy-mno-performancelab.md
index 1a870b51..51468ba6 100644
--- a/docs/deploy-mno-performancelab.md
+++ b/docs/deploy-mno-performancelab.md
@@ -290,7 +290,6 @@ In order to deploy in the public VLAN, some variables need to be configured:
 
 - `public_vlan`: Enable this variable **before creating the inventory**, to let jetlag to auto-configure the interface number (`controlplane_network_interface_idx`) to the last of the available NICs of the ocpinventory.json file, when this variable is configured, `base_dns_name` is set to `rdu2.scalelab.redhat.com` in the inventory file.
 - `cluster_name`: Should be configured to the public VLAN name. i.e: `vlan600`, check the public VLANs allocation info in the [scalelab's wiki](https://wiki.rdu3.labs.perfscale.redhat.com/vlans/)
-- `controlplane_network`, `network_prefix` and `gateway` also need to be configured to its corresponding values.
 
 Once the deployment is completed, the cluster API and routes should be reachable directly from the VPN.
 
diff --git a/docs/deploy-mno-scalelab.md b/docs/deploy-mno-scalelab.md
index 0cde73f7..c7be125f 100644
--- a/docs/deploy-mno-scalelab.md
+++ b/docs/deploy-mno-scalelab.md
@@ -288,7 +288,6 @@ In order to deploy in the public VLAN, some variables need to be configured:
 
 - `public_vlan`: Enable this variable **before creating the inventory**, to let jetlag to auto-configure the interface number (`controlplane_network_interface_idx`) to the last of the available NICs of the ocpinventory.json file, when this variable is configured, `base_dns_name` is set to `rdu2.scalelab.redhat.com` in the inventory file.
 - `cluster_name`: Should be configured to the public VLAN name. i.e: `vlan600`, check the public VLANs allocation info in the [scalelab's wiki](https://wiki.rdu2.scalelab.redhat.com/vlans/)
-- `controlplane_network`, `network_prefix` and `gateway` also need to be configured to its corresponding values.
 
 Once the deployment is completed, the cluster API and routes should be reachable directly from the VPN.
 

From ee0aba6bc5b7eafa670ebeb4664c2b0c1b5ef7ca Mon Sep 17 00:00:00 2001
From: Raul Sevilla <rsevilla@redhat.com>
Date: Fri, 20 Sep 2024 01:45:33 +0200
Subject: [PATCH 04/10] Consume quads API

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
---
 ansible/roles/create-inventory/tasks/main.yml    | 12 ++++++------
 .../create-inventory/templates/inventory-mno.j2  |  5 +++--
 ansible/vars/all.sample.yml                      |  5 +++--
 ansible/vars/lab.yml                             |  2 +-
 docs/deploy-mno-performancelab.md                | 16 +++++++++++-----
 docs/deploy-mno-scalelab.md                      | 16 +++++++++++-----
 6 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/ansible/roles/create-inventory/tasks/main.yml b/ansible/roles/create-inventory/tasks/main.yml
index 4669f96a..38138516 100644
--- a/ansible/roles/create-inventory/tasks/main.yml
+++ b/ansible/roles/create-inventory/tasks/main.yml
@@ -56,7 +56,7 @@
 
   - name: Get assignment from quads
     uri:
-      url: "https://{{ labs[lab]['quads'] }}/api/v1/assignments/active/{{ lab_cloud}}/"
+      url: "https://{{ labs[lab]['quads'] }}/api/v3/assignments/active/{{ lab_cloud }}"
       force_basic_auth: yes
       user: "{{ lab_cloud }}"
       password: "{{ ocpinventory.json.nodes[0].pm_password }}"
@@ -65,8 +65,8 @@
 
   - name: Public VLAN - Set addressing information
     set_fact:
-      controlplane_network: "{{ quads_assignment.json.vlan.address }}"
-      network_prefix: "{{ quads_assignment.json.vlan.prefix }}"
+      controlplane_network: "{{ quads_assignment.json.vlan.ip_range }}"
+      network_prefix: "{{ quads_assignment.json.vlan.ip_range | ipaddr('prefix') }}"
       gateway: "{{ quads_assignment.json.vlan.gateway }}"
       cluster_name: "vlan{{ quads_assignment.json.vlan.vlan_id }}"
 
@@ -78,9 +78,9 @@
       controlplane0: "{{ ocpinventory.json.nodes[1].pm_addr }}"
       controlplane1: "{{ ocpinventory.json.nodes[2].pm_addr }}"
       controlplane2: "{{ ocpinventory.json.nodes[3].pm_addr }}"
-      controlplane0_network_mac: "{{ ocpinventory.json.nodes[1].mac[controlplane_network_interface_idx] }}"
-      controlplane1_network_mac: "{{ ocpinventory.json.nodes[2].mac[controlplane_network_interface_idx] }}"
-      controlplane2_network_mac: "{{ ocpinventory.json.nodes[3].mac[controlplane_network_interface_idx] }}"
+      controlplane0_network_mac: "{{ ocpinventory.json.nodes[1].mac[controlplane_network_interface_idx | int] }}"
+      controlplane1_network_mac: "{{ ocpinventory.json.nodes[2].mac[controlplane_network_interface_idx | int] }}"
+      controlplane2_network_mac: "{{ ocpinventory.json.nodes[3].mac[controlplane_network_interface_idx | int] }}"
       controlplane0_vendor: "{{ hw_vendor[(ocpinventory.json.nodes[1].pm_addr.split('.')[0]).split('-')[-1]] }}"
       controlplane1_vendor: "{{ hw_vendor[(ocpinventory.json.nodes[2].pm_addr.split('.')[0]).split('-')[-1]] }}"
       controlplane2_vendor: "{{ hw_vendor[(ocpinventory.json.nodes[3].pm_addr.split('.')[0]).split('-')[-1]] }}"
diff --git a/ansible/roles/create-inventory/templates/inventory-mno.j2 b/ansible/roles/create-inventory/templates/inventory-mno.j2
index 72b4bea1..8bfc6e76 100644
--- a/ansible/roles/create-inventory/templates/inventory-mno.j2
+++ b/ansible/roles/create-inventory/templates/inventory-mno.j2
@@ -1,10 +1,11 @@
 [all:vars]
 allocation_node_count={{ ocpinventory.json.nodes | length }}
 supermicro_nodes={{ has_supermicro | bool }}
+cluster_name={{ cluster_name }}
 {% if public_vlan %}
-{% if lab_name == "scalelab" %}
+{% if lab == "scalelab" %}
 base_dns_name=rdu2.scalelab.redhat.com
-{% elif lab_name == "performancelab" %}
+{% elif lab == "performancelab" %}
 base_dns_name=rdu3.labs.perfscale.redhat.com
 {% else %}
 base_dns_name=example.com
diff --git a/ansible/vars/all.sample.yml b/ansible/vars/all.sample.yml
index 08413d55..5b7c81ac 100644
--- a/ansible/vars/all.sample.yml
+++ b/ansible/vars/all.sample.yml
@@ -35,8 +35,9 @@ networktype: OVNKubernetes
 # Set this variable if you want to host your SNO cluster on lab public routable
 # VLAN network, set this ONLY if you have public routable VLAN enabled in your
 # scalelab cloud
-# For bm clusters, enable this variable to autoconfigure controlplane_network_interface_idx and
-# base_dns_name to the according values
+# For bm clusters, enable this variable to autoconfigure controlplane_network_interface_idx,
+# base_dns_name, cluster_name, controlplane_network, network_prefix, gateway to the values
+# required in the public VLAN
 public_vlan: false
 
 # Enables FIPs security standard
diff --git a/ansible/vars/lab.yml b/ansible/vars/lab.yml
index 9fcb08c0..8cb1bb6c 100644
--- a/ansible/vars/lab.yml
+++ b/ansible/vars/lab.yml
@@ -24,7 +24,7 @@ labs:
     - 10.1.36.2
     foreman: foreman.rdu2.scalelab.redhat.com
     ntp_server: clock1.rdu2.redhat.com
-    quads: quads.rdu2.scalelab.redhat.com
+    quads: quads2.rdu2.scalelab.redhat.com
 
 # NOTE: This should map every server model in the Scale and Performance labs to
 # the vendor. Right now, Jetlag supports only the Dell and Supermicro vendors,
diff --git a/docs/deploy-mno-performancelab.md b/docs/deploy-mno-performancelab.md
index 51468ba6..07346c0a 100644
--- a/docs/deploy-mno-performancelab.md
+++ b/docs/deploy-mno-performancelab.md
@@ -286,10 +286,15 @@ controlplane_lab_interface: eno8303
 
 ### Deploy in the public VLAN
 
-In order to deploy in the public VLAN, some variables need to be configured:
+In order to deploy in the public VLAN, set the variable `public_vlan` in `all.yml` to true. Once this variable is enable jetlag:
 
-- `public_vlan`: Enable this variable **before creating the inventory**, to let jetlag to auto-configure the interface number (`controlplane_network_interface_idx`) to the last of the available NICs of the ocpinventory.json file, when this variable is configured, `base_dns_name` is set to `rdu2.scalelab.redhat.com` in the inventory file.
-- `cluster_name`: Should be configured to the public VLAN name. i.e: `vlan600`, check the public VLANs allocation info in the [scalelab's wiki](https://wiki.rdu3.labs.perfscale.redhat.com/vlans/)
+- Auto-configures the interface number (`controlplane_network_interface_idx`) to the last of the available NICs of the ocpinventory.json file.
+- `base_dns_name` is set to `rdu3.lab.perfscale.redhat.com` in the inventory
+- With the help of the `quads` API these variables are also configured automatically:
+  - `controlplane_network`: public VLAN subnet
+  - `network_prefix`: public VLAN network mask
+  - `gateway`: public VLAN default gateway
+  - `cluster_name`: cluster name according to the pre-existing DNS records in the public VLAN, i.e: `vlan604`
 
 Once the deployment is completed, the cluster API and routes should be reachable directly from the VPN.
 
@@ -347,8 +352,9 @@ worker_node_count: 2
 # Set this variable if you want to host your SNO cluster on lab public routable
 # VLAN network, set this ONLY if you have public routable VLAN enabled in your
 # Red Hat cloud
-# For bm clusters, enable this variable to autoconfigure controlplane_network_interface_idx and
-# base_dns_name to the according values
+# For bm clusters, enable this variable to autoconfigure controlplane_network_interface_idx,
+# base_dns_name, cluster_name, controlplane_network, network_prefix, gateway to the values
+# required in the public VLAN
 public_vlan: false
 
 # Enter whether the build should use 'dev' (early candidate builds) or 'ga' for Generally Available versions of OpenShift
diff --git a/docs/deploy-mno-scalelab.md b/docs/deploy-mno-scalelab.md
index c7be125f..37ff398b 100644
--- a/docs/deploy-mno-scalelab.md
+++ b/docs/deploy-mno-scalelab.md
@@ -284,10 +284,15 @@ controlplane_lab_interface: eno12399np0
 
 ### Deploy in the public VLAN
 
-In order to deploy in the public VLAN, some variables need to be configured:
+In order to deploy in the public VLAN, set the variable `public_vlan` in `all.yml` to true. Once this variable is enable jetlag:
 
-- `public_vlan`: Enable this variable **before creating the inventory**, to let jetlag to auto-configure the interface number (`controlplane_network_interface_idx`) to the last of the available NICs of the ocpinventory.json file, when this variable is configured, `base_dns_name` is set to `rdu2.scalelab.redhat.com` in the inventory file.
-- `cluster_name`: Should be configured to the public VLAN name. i.e: `vlan600`, check the public VLANs allocation info in the [scalelab's wiki](https://wiki.rdu2.scalelab.redhat.com/vlans/)
+- Auto-configures the interface number (`controlplane_network_interface_idx`) to the last of the available NICs of the ocpinventory.json file.
+- `base_dns_name` is set to `rdu2.scalelab.redhat.com` in the inventory
+- With the help of the `quads` API these variables are also configured automatically:
+  - `controlplane_network`: public VLAN subnet
+  - `network_prefix`: public VLAN network mask
+  - `gateway`: public VLAN default gateway
+  - `cluster_name`: cluster name according to the pre-existing DNS records in the public VLAN, i.e: `vlan604`
 
 Once the deployment is completed, the cluster API and routes should be reachable directly from the VPN.
 
@@ -344,8 +349,9 @@ worker_node_count: 0
 # Set this variable if you want to host your SNO cluster on lab public routable
 # VLAN network, set this ONLY if you have public routable VLAN enabled in your
 # Red Hat cloud
-# For bm clusters, enable this variable to autoconfigure controlplane_network_interface_idx and
-# base_dns_name to the according values
+# For bm clusters, enable this variable to autoconfigure controlplane_network_interface_idx,
+# base_dns_name, cluster_name, controlplane_network, network_prefix, gateway to the values
+# required in the public VLAN
 public_vlan: false
 
 # Enter whether the build should use 'dev' (early candidate builds) or 'ga' for Generally Available versions of OpenShift

From 5e2acb2ae0a6a0ef94e7177404591fbe8fb438a5 Mon Sep 17 00:00:00 2001
From: Raul Sevilla <rsevilla@redhat.com>
Date: Mon, 23 Sep 2024 12:30:53 +0200
Subject: [PATCH 05/10] Get VLAN information from performancelab

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
---
 ansible/roles/create-inventory/tasks/main.yml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/create-inventory/tasks/main.yml b/ansible/roles/create-inventory/tasks/main.yml
index 38138516..d73e2ab9 100644
--- a/ansible/roles/create-inventory/tasks/main.yml
+++ b/ansible/roles/create-inventory/tasks/main.yml
@@ -54,7 +54,7 @@
     set_fact:
       controlplane_network_interface_idx: "{{ ocpinventory.json.nodes[0].mac | length - 1 }}"
 
-  - name: Get assignment from quads
+  - name: Get assignment from scalelab quads
     uri:
       url: "https://{{ labs[lab]['quads'] }}/api/v3/assignments/active/{{ lab_cloud }}"
       force_basic_auth: yes
@@ -62,13 +62,28 @@
       password: "{{ ocpinventory.json.nodes[0].pm_password }}"
       validate_certs: false
     register: quads_assignment
+    when: lab == "scalelab"
 
-  - name: Public VLAN - Set addressing information
+  - name: Public scalelab VLAN - Set addressing information
     set_fact:
       controlplane_network: "{{ quads_assignment.json.vlan.ip_range }}"
       network_prefix: "{{ quads_assignment.json.vlan.ip_range | ipaddr('prefix') }}"
       gateway: "{{ quads_assignment.json.vlan.gateway }}"
       cluster_name: "vlan{{ quads_assignment.json.vlan.vlan_id }}"
+    when: lab == "scalelab"
+
+  - name: Get VLAN info from performancelab quads
+    shell: "curl -sk https://wiki.rdu3.labs.perfscale.redhat.com/vlans/ | grep -B7 {{ lab_cloud }} | sed 's/<\\/\\?td>//g' | xargs | column -J --table-columns vlan_id,cidr,netmask,gateway,ipfree,owner,ticket,cloud"
+    register: vlan_info
+    when: lab == "performancelab"
+
+  - name: Public performancelab VLAN - Set addressing information
+    set_fact:
+      controlplane_network: "{{ (vlan_info.stdout | from_json).table[0].cidr }}"
+      network_prefix: "{{ (vlan_info.stdout | from_json).table[0].cidr | ipaddr('prefix') }}"
+      gateway: "{{ (vlan_info.stdout | from_json).table[0].gateway }}"
+      cluster_name: "vlan{{ (vlan_info.stdout | from_json).table[0].vlan_id }}"
+    when: lab == "performancelab"
 
 - name: Bare metal cluster and remote worker node cluster type tasks
   when: cluster_type == "mno" or cluster_type == "rwn"

From e485b443b0d74c9ff3114f2407337bc5bcfaa51c Mon Sep 17 00:00:00 2001
From: Raul Sevilla <rsevilla@redhat.com>
Date: Mon, 23 Sep 2024 14:00:37 +0200
Subject: [PATCH 06/10] Add base_dns_name to all.yml and take it out from
 defaults

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
---
 ansible/roles/create-inventory/templates/inventory-mno.j2 | 2 +-
 docs/deploy-mno-performancelab.md                         | 2 +-
 docs/deploy-mno-scalelab.md                               | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/create-inventory/templates/inventory-mno.j2 b/ansible/roles/create-inventory/templates/inventory-mno.j2
index 8bfc6e76..173765af 100644
--- a/ansible/roles/create-inventory/templates/inventory-mno.j2
+++ b/ansible/roles/create-inventory/templates/inventory-mno.j2
@@ -8,7 +8,7 @@ base_dns_name=rdu2.scalelab.redhat.com
 {% elif lab == "performancelab" %}
 base_dns_name=rdu3.labs.perfscale.redhat.com
 {% else %}
-base_dns_name=example.com
+base_dns_name={{ base_dns_name }}
 {% endif %}
 {% endif %}
 
diff --git a/docs/deploy-mno-performancelab.md b/docs/deploy-mno-performancelab.md
index 07346c0a..3d5b77c1 100644
--- a/docs/deploy-mno-performancelab.md
+++ b/docs/deploy-mno-performancelab.md
@@ -354,7 +354,7 @@ worker_node_count: 2
 # Red Hat cloud
 # For bm clusters, enable this variable to autoconfigure controlplane_network_interface_idx,
 # base_dns_name, cluster_name, controlplane_network, network_prefix, gateway to the values
-# required in the public VLAN
+# required in the public VLAN attached to the lab assignment
 public_vlan: false
 
 # Enter whether the build should use 'dev' (early candidate builds) or 'ga' for Generally Available versions of OpenShift
diff --git a/docs/deploy-mno-scalelab.md b/docs/deploy-mno-scalelab.md
index 37ff398b..987e4b68 100644
--- a/docs/deploy-mno-scalelab.md
+++ b/docs/deploy-mno-scalelab.md
@@ -345,13 +345,16 @@ cluster_type: mno
 # Applies to both mno/rwn clusters
 worker_node_count: 0
 
+# Applies to bm/rwn/sno clusters
+base_dns_name: example.com
+
 # Lab Network type, applies to sno and bm cluster_type only
 # Set this variable if you want to host your SNO cluster on lab public routable
 # VLAN network, set this ONLY if you have public routable VLAN enabled in your
 # Red Hat cloud
 # For bm clusters, enable this variable to autoconfigure controlplane_network_interface_idx,
 # base_dns_name, cluster_name, controlplane_network, network_prefix, gateway to the values
-# required in the public VLAN
+# required in the public VLAN attached to the lab assignment
 public_vlan: false
 
 # Enter whether the build should use 'dev' (early candidate builds) or 'ga' for Generally Available versions of OpenShift

From 9ec6f2562c3a3ce82f6d1714fe9595524f5c32bc Mon Sep 17 00:00:00 2001
From: Raul Sevilla <rsevilla@redhat.com>
Date: Tue, 24 Sep 2024 12:57:04 +0200
Subject: [PATCH 07/10] Addressing comments

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
---
 ansible/roles/create-inventory/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/create-inventory/tasks/main.yml b/ansible/roles/create-inventory/tasks/main.yml
index d73e2ab9..0083bacd 100644
--- a/ansible/roles/create-inventory/tasks/main.yml
+++ b/ansible/roles/create-inventory/tasks/main.yml
@@ -73,7 +73,7 @@
     when: lab == "scalelab"
 
   - name: Get VLAN info from performancelab quads
-    shell: "curl -sk https://wiki.rdu3.labs.perfscale.redhat.com/vlans/ | grep -B7 {{ lab_cloud }} | sed 's/<\\/\\?td>//g' | xargs | column -J --table-columns vlan_id,cidr,netmask,gateway,ipfree,owner,ticket,cloud"
+    shell: "curl -sk https://wiki.rdu3.labs.perfscale.redhat.com/vlans/ | grep -B7 {{ lab_cloud }} | sed -E 's#</?td>##g'| tr '\n' ' ' | column -J --table-columns vlan_id,cidr,netmask,gateway,ipfree,owner,ticket,cloud"
     register: vlan_info
     when: lab == "performancelab"
 

From 65473b6f7d8475ccb0806b48d66973012d137364 Mon Sep 17 00:00:00 2001
From: Raul Sevilla <rsevilla@redhat.com>
Date: Tue, 24 Sep 2024 15:18:24 +0200
Subject: [PATCH 08/10] Addressing documentation suggestions

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
---
 docs/deploy-mno-performancelab.md | 15 +++++++--------
 docs/deploy-mno-scalelab.md       | 15 +++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/docs/deploy-mno-performancelab.md b/docs/deploy-mno-performancelab.md
index 3d5b77c1..1230d3e8 100644
--- a/docs/deploy-mno-performancelab.md
+++ b/docs/deploy-mno-performancelab.md
@@ -286,17 +286,16 @@ controlplane_lab_interface: eno8303
 
 ### Deploy in the public VLAN
 
-In order to deploy in the public VLAN, set the variable `public_vlan` in `all.yml` to true. Once this variable is enable jetlag:
+In order to deploy a cluster using the public VLAN, set the variable `public_vlan` in `all.yml` to `true`. Once enabled the following variables are automatically configured:
 
-- Auto-configures the interface number (`controlplane_network_interface_idx`) to the last of the available NICs of the ocpinventory.json file.
+- `controlplane_network_interface_idx`: Is set to the corresponding interface number
 - `base_dns_name` is set to `rdu3.lab.perfscale.redhat.com` in the inventory
-- With the help of the `quads` API these variables are also configured automatically:
-  - `controlplane_network`: public VLAN subnet
-  - `network_prefix`: public VLAN network mask
-  - `gateway`: public VLAN default gateway
-  - `cluster_name`: cluster name according to the pre-existing DNS records in the public VLAN, i.e: `vlan604`
+- `controlplane_network`: public VLAN subnet
+- `network_prefix`: public VLAN network mask
+- `gateway`: public VLAN default gateway
+- `cluster_name`: cluster name according to the pre-existing DNS records in the public VLAN, i.e: `vlan604`
 
-Once the deployment is completed, the cluster API and routes should be reachable directly from the VPN.
+When the deployment is completed, the cluster API and routes should be reachable directly from the VPN.
 
 ### Extra vars
 
diff --git a/docs/deploy-mno-scalelab.md b/docs/deploy-mno-scalelab.md
index 987e4b68..44962f39 100644
--- a/docs/deploy-mno-scalelab.md
+++ b/docs/deploy-mno-scalelab.md
@@ -284,17 +284,16 @@ controlplane_lab_interface: eno12399np0
 
 ### Deploy in the public VLAN
 
-In order to deploy in the public VLAN, set the variable `public_vlan` in `all.yml` to true. Once this variable is enable jetlag:
+In order to deploy a cluster using the public VLAN, set the variable `public_vlan` in `all.yml` to `true`. Once enabled the following variables are automatically configured:
 
-- Auto-configures the interface number (`controlplane_network_interface_idx`) to the last of the available NICs of the ocpinventory.json file.
+- `controlplane_network_interface_idx`: Is set to the corresponding interface number
 - `base_dns_name` is set to `rdu2.scalelab.redhat.com` in the inventory
-- With the help of the `quads` API these variables are also configured automatically:
-  - `controlplane_network`: public VLAN subnet
-  - `network_prefix`: public VLAN network mask
-  - `gateway`: public VLAN default gateway
-  - `cluster_name`: cluster name according to the pre-existing DNS records in the public VLAN, i.e: `vlan604`
+- `controlplane_network`: public VLAN subnet
+- `network_prefix`: public VLAN network mask
+- `gateway`: public VLAN default gateway
+- `cluster_name`: cluster name according to the pre-existing DNS records in the public VLAN, i.e: `vlan604`
 
-Once the deployment is completed, the cluster API and routes should be reachable directly from the VPN.
+When the deployment is completed, the cluster API and routes should be reachable directly from the VPN.
 
 ### Extra vars
 

From 2def130cce28c78087b6a4b96dd03f9d023fc9ac Mon Sep 17 00:00:00 2001
From: Raul Sevilla <rsevilla@redhat.com>
Date: Wed, 2 Oct 2024 11:55:28 +0200
Subject: [PATCH 09/10] Conditional cluster_name

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
---
 ansible/roles/create-inventory/templates/inventory-mno.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/create-inventory/templates/inventory-mno.j2 b/ansible/roles/create-inventory/templates/inventory-mno.j2
index 173765af..177b3ae2 100644
--- a/ansible/roles/create-inventory/templates/inventory-mno.j2
+++ b/ansible/roles/create-inventory/templates/inventory-mno.j2
@@ -1,8 +1,8 @@
 [all:vars]
 allocation_node_count={{ ocpinventory.json.nodes | length }}
 supermicro_nodes={{ has_supermicro | bool }}
-cluster_name={{ cluster_name }}
 {% if public_vlan %}
+cluster_name={{ cluster_name }}
 {% if lab == "scalelab" %}
 base_dns_name=rdu2.scalelab.redhat.com
 {% elif lab == "performancelab" %}

From 255f5084964a98f7d18305b5888270f17964f329 Mon Sep 17 00:00:00 2001
From: Raul Sevilla <rsevilla@redhat.com>
Date: Wed, 2 Oct 2024 16:05:09 +0200
Subject: [PATCH 10/10] Address comments

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
---
 ansible/vars/all.sample.yml       | 6 +++++-
 docs/deploy-mno-performancelab.md | 6 ++----
 docs/deploy-mno-scalelab.md       | 5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ansible/vars/all.sample.yml b/ansible/vars/all.sample.yml
index 5b7c81ac..30b47926 100644
--- a/ansible/vars/all.sample.yml
+++ b/ansible/vars/all.sample.yml
@@ -11,9 +11,13 @@ lab_cloud:
 # Either mno or rwn or sno
 cluster_type:
 
-# Applies to both mno/rwn clusters
+# Applies to both bm/rwn clusters
+cluster_name: mno
 worker_node_count:
 
+# Applies to mno/rwn/sno clusters
+base_dns_name: example.com
+
 # Enter whether the build should use 'dev' (early candidate builds) or 'ga' for Generally Available versions of OpenShift
 # Empty value results in playbook failing with error message. Example of dev builds would be 'candidate-4.17', 'candidate-4.16'
 # or 'latest' (which would point to the early candidate build of the latest in development release) and examples of 'ga' builds would
diff --git a/docs/deploy-mno-performancelab.md b/docs/deploy-mno-performancelab.md
index 1230d3e8..94c6adf5 100644
--- a/docs/deploy-mno-performancelab.md
+++ b/docs/deploy-mno-performancelab.md
@@ -341,10 +341,8 @@ lab: performancelab
 # Which cloud in the lab environment (Ex cloud42)
 lab_cloud: cloud99
 
-# Either mno or rwn or sno
-cluster_type: mno
-
-# Applies to both mno/rwn clusters
+# Applies to both bm/rwn clusters
+cluster_name: mno
 worker_node_count: 2
 
 # Lab Network type, applies to sno and bm cluster_type only
diff --git a/docs/deploy-mno-scalelab.md b/docs/deploy-mno-scalelab.md
index 44962f39..38b3021f 100644
--- a/docs/deploy-mno-scalelab.md
+++ b/docs/deploy-mno-scalelab.md
@@ -341,8 +341,9 @@ lab_cloud: cloud99
 # Either mno or rwn or sno
 cluster_type: mno
 
-# Applies to both mno/rwn clusters
-worker_node_count: 0
+# Applies to both bm/rwn clusters
+cluster_name: mno
+worker_node_count: 2
 
 # Applies to bm/rwn/sno clusters
 base_dns_name: example.com