Several fixes for byol

Author: akrzos

Diff for: ansible/roles/create-ai-cluster/tasks/static_network_config.yml

@@ -6,7 +6,7 @@
     item_network_config:
       network_yaml: "{{ lookup('template', 'nmstate.yml.j2') }}"
       mac_interface_map: "{{ lookup('template', 'mac_interface_map.json.j2')  }}"
-  when: lab in rh_labs
+  when: lab in rh_labs or lab == "byol"
 
 - name: Assemble static network config for ibmcloud lab
   set_fact:

Diff for: ansible/roles/validate-vars/tasks/main.yml

@@ -3,10 +3,11 @@
 
 - name: Validate lab
   fail:
-    msg: "Invalid lab selected('{{ lab }}') Select from {{ rh_labs }} and {{ cloud_labs }}"
+    msg: "Invalid lab selected('{{ lab }}') Select from {{ rh_labs }}, {{ cloud_labs }} and 'byol'"
   when:
   - lab not in rh_labs
   - lab not in cloud_labs
+  - lab != "byol"
 
 - name: Check pull secret var is set
   fail:

Diff for: ansible/roles/wait-hosts-discovered/tasks/set_hostname_role.yml

@@ -16,7 +16,7 @@
     hostname: "{{ item }}"
     host_role: "{{ hostvars[item]['role'] }}"
   when:
-    - lab in rh_labs
+    - lab in rh_labs or lab == "byol"
     - hostvars[item]['mac_address'] | lower in host_macs
   loop: "{{ inventory_nodes }}"
 

Diff for: ansible/vars/lab.yml

@@ -9,7 +9,6 @@ cloud_labs:
 rh_labs:
 - performancelab
 - scalelab
-- byol
 
 labs:
   performancelab:

Diff for: docs/deploy-mno-byol.md

@@ -1,14 +1,12 @@
-# Deploy a Multi Node OpenShift cluster via Jetlag from a non-standard lab, BYOL (Bring Your Own Lab), quickstart
+# Deploy a Multi Node OpenShift cluster via Jetlag without create-inventory playbook, BYOL (Bring Your Own Lab), quickstart
 
-Assuming that you receive a set of machines to install OCP, this guide walks you through getting a multi node cluster installed on this allocation. For the purposes of the guide, the machines used are Dell r660s and r760s running RHEL 9.2. In a BYOL (or with any non-homogeneous allocation containing machines of different models) due to the non-standard interface names and NIC PCI slots, you must craft Jetlag's inventory file by hand.
-
-In other words, the `create-inventory` playbook is not used with BYOL. You must instead create your own inventory file manually, which means gathering information regarding the machines such as NIC names and MAC addresses. Therefore, thinking about simplifying this step, it is recommended to group machines of same/similar models wisely to be the cluster's control-plane and worker nodes.
+In a BYOL you will have to write your own Jetlag's inventory file as the `create-inventory` playbook is not used. You must gather information regarding the machines such as NIC names and MAC addresses and assemble an inventory file. If you have a non-homogenous set of machines, it is recommended to group machines of same/similar models to be the cluster's control-plane and worker nodes.
 
 The bastion machine needs 2 interfaces:
 - The interface connected to the network, i.e., with an IP assigned, a L3 network. This interface usually referred to as *lab_network* as it provides the connectivity into the bastion machine.
 - The control-plane interface, from which the cluster nodes are accessed (this is a L2 network, i.e., it does not have an IP assigned).
 
-Sometimes the bastion machine may have firewall rules in place that prevent proper connectivity from the target cluster machines to the assisted-service API hosted on the bastion. Depending on the lab setup, you might need to add rules to allow this traffic, or if the bastion machine is already behind a firewall, the firewall could be disabled. One can, for instance, check for `firewalld` or `iptables`.
+Sometimes the bastion machine may have firewall rules in place that prevent proper connectivity from the target cluster machines to the assisted-service API hosted on the bastion. Depending on the lab setup, you might need to add rules to allow this traffic, or if the bastion machine is already behind a firewall, the firewall could be disabled. You should check both `firewalld` and/or `iptables`.
 
 The cluster machines need a minimum of 1 online private interface:
 - The control-plane interface, from which other cluster nodes are accessed.
@@ -226,10 +224,10 @@ Set `smcipmitool_url` to the location of the Supermicro SMCIPMITool binary. Sinc
 
 In case of BYOL, the lab itself determines the values of `bastion_lab_interface` and `bastion_controlplane_interface`.
 
-* `bastion_lab_interface` should be the L2 NIC interface
-* `bastion_controlplane_interface` should be the L3 network NIC interface
+* `bastion_lab_interface` should be the public lab network interface
+* `bastion_controlplane_interface` should be the private network inferface
 
-For Dell r660 from this guide, set those vars to the following:
+For the hardware in this guide, set those vars to the following (Your hardware will be different, and you must determine those values):
 
 ```yaml
 bastion_lab_interface: eno8303
@@ -238,11 +236,10 @@ bastion_controlplane_interface: ens1f0
 
 ### OCP node vars
 
-The system type determines the value of `controlplane_lab_interface`.
 
-* `controlplane_lab_interface` should be the L2 NIC interface
+* `controlplane_lab_interface` should be the public lab interface
 
-For Dell r660 from this guide, set this var to the following:
+For the hardware in this guide, set this var to the following (Your hardware will be different, and you must determine the correct interface):
 
 ```yaml
 controlplane_lab_interface: eno8303
@@ -290,6 +287,10 @@ ocp_version: "latest-4.18"
 # SNOs require manual configuration with additional variables.
 public_vlan: false
 
+# SNOs only require a single IP address and can be deployed using the lab DHCP interface instead of a private or
+# public vlan network. Set to true to have your SNO deployed on the public lab DHCP network.
+sno_use_lab_dhcp: false
+
 # Enables FIPs security standard
 enable_fips: false
 
@@ -324,14 +325,9 @@ use_bastion_registry: false
 ################################################################################
 # OCP node vars
 ################################################################################
-# Network configuration for all mno cluster nodes
+# Network configuration for all mno/sno cluster nodes
 controlplane_lab_interface: eno8303
 
-# Network configuration for public VLAN based sno cluster_type deployment
-controlplane_pub_network_cidr:
-controlplane_pub_network_gateway:
-jumbo_mtu: false
-
 ################################################################################
 # Extra vars
 ################################################################################
@@ -364,9 +360,9 @@ bmc_user=root
 bmc_password=password
 
 [controlplane]
-control-plane-0 bmc_address=<IP or FQDN> mac_address=<L3 NIC> lab_mac=<L2 NIC> ip=198.18.10.5 vendor=Dell install_disk=/dev/disk/by-path/...
-control-plane-1 bmc_address=<IP or FQDN> mac_address=<L3 NIC> lab_mac=<L2 NIC> ip=198.18.10.6 vendor=Dell install_disk=/dev/disk/by-path/...
-control-plane-2 bmc_address=<IP or FQDN> mac_address=<L3 NIC> lab_mac=<L2 NIC> ip=198.18.10.7 vendor=Dell install_disk=/dev/disk/by-path/...
+control-plane-0 bmc_address=<IP or FQDN> mac_address=<L3 NIC> lab_mac=<L2 NIC> ip=198.18.0.5 vendor=Dell install_disk=/dev/disk/by-path/...
+control-plane-1 bmc_address=<IP or FQDN> mac_address=<L3 NIC> lab_mac=<L2 NIC> ip=198.18.0.6 vendor=Dell install_disk=/dev/disk/by-path/...
+control-plane-2 bmc_address=<IP or FQDN> mac_address=<L3 NIC> lab_mac=<L2 NIC> ip=198.18.0.7 vendor=Dell install_disk=/dev/disk/by-path/...
 
 [controlplane:vars]
 role=master
@@ -375,14 +371,14 @@ bmc_user=root
 bmc_password=password
 lab_interface=<lab_mac interface name>
 network_interface=<anything>
-network_prefix=24
-gateway=198.18.10.1
-dns1=198.18.10.1
+network_prefix=16
+gateway=198.18.0.1
+dns1=198.18.0.1
 dns2=<DNS ip_address>
 
 [worker]
-worker-0 bmc_address=172.29.170.219 mac_address=<L3 NIC> lab_mac=<L2 NIC> ip=198.18.10.8 vendor=Dell install_disk=/dev/disk/by-path/...
-worker-1 bmc_address=172.29.170.73 mac_address=<L3 NIC> lab_mac=<L2 NIC> ip=198.18.10.9 vendor=Dell install_disk=/dev/disk/by-path/...
+worker-0 bmc_address=172.29.170.219 mac_address=<L3 NIC> lab_mac=<L2 NIC> ip=198.18.0.8 vendor=Dell install_disk=/dev/disk/by-path/...
+worker-1 bmc_address=172.29.170.73 mac_address=<L3 NIC> lab_mac=<L2 NIC> ip=198.18.0.9 vendor=Dell install_disk=/dev/disk/by-path/...
 
 [worker:vars]
 role=worker
@@ -391,9 +387,9 @@ bmc_user=root
 bmc_password=password
 lab_interface=<lab_mac interface name>
 network_interface=<anything>
-network_prefix=24
-gateway=198.18.10.1
-dns1=198.18.10.1
+network_prefix=16
+gateway=198.18.0.1
+dns1=198.18.0.1
 dns2=<DNS ip_address>
 
 [sno]