diff --git a/ansible/roles/create-ai-cluster/tasks/main.yml b/ansible/roles/create-ai-cluster/tasks/main.yml index ec2462f2..aff36a95 100644 --- a/ansible/roles/create-ai-cluster/tasks/main.yml +++ b/ansible/roles/create-ai-cluster/tasks/main.yml @@ -55,7 +55,7 @@ "additional_ntp_source": "{{ bastion_controlplane_ip if use_bastion_registry else labs[lab]['ntp_server'] }}", "api_vips": [{"ip": "{{ controlplane_network_api }}"}], "ingress_vips": [{"ip": "{{ controlplane_network_ingress }}"}], - "network_type": "{{ networktype }}" + "network_type": "OVNKubernetes" } register: create_cluster_return diff --git a/ansible/roles/install-cluster/templates/install-config-overrides.yml.j2 b/ansible/roles/install-cluster/templates/install-config-overrides.yml.j2 index 4bf49275..51a6339e 100644 --- a/ansible/roles/install-cluster/templates/install-config-overrides.yml.j2 +++ b/ansible/roles/install-cluster/templates/install-config-overrides.yml.j2 @@ -21,7 +21,7 @@ capabilities: {% endif %} {% else %} networking: - networkType: {{ networktype }} + networkType: OVNKubernetes {% endif %} {% if enable_fips | default(false) %} fips: true diff --git a/ansible/roles/validate-vars/tasks/main.yml b/ansible/roles/validate-vars/tasks/main.yml index a97cb1bb..439fc3e5 100644 --- a/ansible/roles/validate-vars/tasks/main.yml +++ b/ansible/roles/validate-vars/tasks/main.yml @@ -60,11 +60,6 @@ msg: "Insufficient number of nodes in your allocation for number of SNOs to be deployed" when: (allocation_node_count is defined and cluster_type == "sno") and (1 > allocation_node_count | int - 1) -- name: Check if networktype is either "OVNKubernetes" or "OpenShiftSDN" - fail: - msg: "networktype can only be OVNKubernetes or OpenShiftSDN for MNO clusters" - when: (cluster_type == "mno") and (networktype not in mno_network_types) - - name: Validate Red Hat lab vars when: lab in rh_labs block: diff --git a/ansible/vars/all.sample.yml b/ansible/vars/all.sample.yml index 9cd1a06a..686514e1 100644 --- a/ansible/vars/all.sample.yml +++ b/ansible/vars/all.sample.yml @@ -28,9 +28,6 @@ ocp_build: "ga" # For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest' ocp_version: "latest-4.17" -# Either "OVNKubernetes" or "OpenShiftSDN" (Only for MNO cluster type) -networktype: OVNKubernetes - # Lab Network type, applies to sno and mno 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 diff --git a/ansible/vars/ibmcloud.sample.yml b/ansible/vars/ibmcloud.sample.yml index cc640ec0..1698daa6 100644 --- a/ansible/vars/ibmcloud.sample.yml +++ b/ansible/vars/ibmcloud.sample.yml @@ -25,9 +25,6 @@ ocp_build: "ga" # For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest' ocp_version: "latest-4.17" -# Either "OVNKubernetes" or "OpenShiftSDN" (Only for MNO cluster type) -networktype: OVNKubernetes - 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: diff --git a/docs/deploy-mno-byol.md b/docs/deploy-mno-byol.md index 5f4446e3..395ec18a 100644 --- a/docs/deploy-mno-byol.md +++ b/docs/deploy-mno-byol.md @@ -208,8 +208,6 @@ Set `ocp_build` to one of 'dev' (early candidate builds) or 'ga' for Generally A Set `ocp_version` to the version of the openshift-installer binary, undefined or empty results in the playbook failing with error message. Values accepted depended on the build chosen ('ga' or 'dev'). For 'ga' builds some examples of what you can use are 'latest-4.13', 'latest-4.14' or explicit versions like 4.15.2 For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest'. -Only change `networktype` if you need to test something other than `OVNKubernetes` - ### Bastion node vars Set `smcipmitool_url` to the location of the Supermicro SMCIPMITool binary. Since you must accept a EULA in order to download, it is suggested to download the file and place it onto a local http server, that is accessible to your laptop or deployment machine. You can then always reference that URL. Alternatively, you can download it to the `ansible/` directory of your Jetlag repo clone and rename the file to `smcipmitool.tar.gz`. You can find the file [here](https://www.supermicro.com/SwDownload/SwSelect_Free.aspx?cat=IPMI). @@ -279,9 +277,6 @@ ocp_build: "ga" # For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest' ocp_version: "latest-4.17" -# Either "OVNKubernetes" or "OpenShiftSDN" (Only for MNO cluster type) -networktype: OVNKubernetes - # Lab Network type, applies to sno and mno 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 diff --git a/docs/deploy-mno-ibmcloud.md b/docs/deploy-mno-ibmcloud.md index ace5e756..1b750757 100644 --- a/docs/deploy-mno-ibmcloud.md +++ b/docs/deploy-mno-ibmcloud.md @@ -199,8 +199,6 @@ Set `ocp_build` to one of 'dev' (early candidate builds) or 'ga' for Generally A Set `ocp_version` to the version of the openshift-installer binary, undefined or empty results in the playbook failing with error message. Values accepted depended on the build chosen ('ga' or 'dev'). For 'ga' builds some examples of what you can use are 'latest-4.13', 'latest-4.14' or explicit versions like 4.15.2 For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest'. -Only change `networktype` if you need to test something other than `OVNKubernetes` - Set `ssh_private_key_file` and `ssh_public_key_file` to the file location of the ssh key files to access your ibmcloud bare metal servers. ### Bastion node vars @@ -261,9 +259,6 @@ ocp_build: "ga" # For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest' ocp_version: "latest-4.17" -# Either "OVNKubernetes" or "OpenShiftSDN" (Only for MNO cluster type) -networktype: OVNKubernetes - ssh_private_key_file: ~/.ssh/ibmcloud_id_rsa ssh_public_key_file: ~/.ssh/ibmcloud_id_rsa.pub # Place your pull_secret.txt in the base directory of the cloned Jetlag repo, Example: diff --git a/docs/deploy-mno-performancelab.md b/docs/deploy-mno-performancelab.md index e18c3c70..39667f78 100644 --- a/docs/deploy-mno-performancelab.md +++ b/docs/deploy-mno-performancelab.md @@ -239,8 +239,6 @@ Set `ocp_build` to one of 'dev' (early candidate builds) or 'ga' for Generally A Set `ocp_version` to the version of the openshift-installer binary, undefined or empty results in the playbook failing with error message. Values accepted depended on the build chosen ('ga' or 'dev'). For 'ga' builds some examples of what you can use are 'latest-4.13', 'latest-4.14' or explicit versions like 4.15.2 For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest'. -Only change `networktype` if you need to test something other than `OVNKubernetes` - ### Bastion node vars Set `smcipmitool_url` to the location of the Supermicro SMCIPMITool binary. Since you must accept a EULA in order to download, it is suggested to download the file and place it onto a local http server, that is accessible to your laptop or deployment machine. You can then always reference that URL. Alternatively, you can download it to the `ansible/` directory of your Jetlag repo clone and rename the file to `smcipmitool.tar.gz`. You can find the file [here](https://www.supermicro.com/SwDownload/SwSelect_Free.aspx?cat=IPMI). @@ -361,9 +359,6 @@ ocp_build: "ga" # For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest' ocp_version: "latest-4.17" -# Either "OVNKubernetes" or "OpenShiftSDN" (Only for MNO cluster type) -networktype: OVNKubernetes - # Lab Network type, applies to sno and mno 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 diff --git a/docs/deploy-mno-scalelab.md b/docs/deploy-mno-scalelab.md index 22b8152f..9f29b253 100644 --- a/docs/deploy-mno-scalelab.md +++ b/docs/deploy-mno-scalelab.md @@ -239,8 +239,6 @@ Set `ocp_build` to one of 'dev' (early candidate builds) or 'ga' for Generally A Set `ocp_version` to the version of the openshift-installer binary, undefined or empty results in the playbook failing with error message. Values accepted depended on the build chosen ('ga' or 'dev'). For 'ga' builds some examples of what you can use are 'latest-4.13', 'latest-4.14' or explicit versions like 4.15.2 For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest'. -Only change `networktype` if you need to test something other than `OVNKubernetes` - ### Bastion node vars Set `smcipmitool_url` to the location of the Supermicro SMCIPMITool binary. Since you must accept a EULA in order to download, it is suggested to download the file and place it onto a local http server, that is accessible to your laptop or deployment machine. You can then always reference that URL. Alternatively, you can download it to the `ansible/` directory of your Jetlag repo clone and rename the file to `smcipmitool.tar.gz`. You can find the file [here](https://www.supermicro.com/SwDownload/SwSelect_Free.aspx?cat=IPMI). @@ -358,9 +356,6 @@ ocp_build: "ga" # For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest' ocp_version: "latest-4.17" -# Either "OVNKubernetes" or "OpenShiftSDN" (Only for MNO cluster type) -networktype: OVNKubernetes - # Lab Network type, applies to sno and mno 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 diff --git a/docs/deploy-sno-ibmcloud.md b/docs/deploy-sno-ibmcloud.md index 5a053bf9..2b8f80a3 100644 --- a/docs/deploy-sno-ibmcloud.md +++ b/docs/deploy-sno-ibmcloud.md @@ -214,9 +214,6 @@ ocp_build: "ga" # For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest' ocp_version: "latest-4.17" -# Either "OVNKubernetes" or "OpenShiftSDN" (Only for MNO cluster type) -networktype: OVNKubernetes - ssh_private_key_file: ~/.ssh/ibmcloud_id_rsa ssh_public_key_file: ~/.ssh/ibmcloud_id_rsa.pub # Place your pull_secret.txt in the base directory of the cloned Jetlag repo, Example: diff --git a/docs/deploy-sno-performancelab.md b/docs/deploy-sno-performancelab.md index 71520960..4e1e74c6 100644 --- a/docs/deploy-sno-performancelab.md +++ b/docs/deploy-sno-performancelab.md @@ -359,9 +359,6 @@ ocp_build: "ga" # For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest' ocp_version: "latest-4.17" -# Either "OVNKubernetes" or "OpenShiftSDN" (Only for MNO cluster type) -networktype: OVNKubernetes - # Lab Network type, applies to sno and mno 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 diff --git a/docs/deploy-sno-scalelab.md b/docs/deploy-sno-scalelab.md index 4d3e2398..1f5cd37f 100644 --- a/docs/deploy-sno-scalelab.md +++ b/docs/deploy-sno-scalelab.md @@ -391,9 +391,6 @@ ocp_build: "ga" # For 'dev' builds some examples of what you can use are 'candidate-4.16' or just 'latest' ocp_version: "latest-4.17" -# Either "OVNKubernetes" or "OpenShiftSDN" (Only for MNO cluster type) -networktype: OVNKubernetes - # Lab Network type, applies to sno and mno 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