From 77660308c665627635b7ace2e17694ca46d8713b Mon Sep 17 00:00:00 2001 From: Nils Koenig Date: Wed, 28 Feb 2024 16:34:09 +0000 Subject: [PATCH 1/2] updated trident to 23.10; renamed variable switch for setting up worker nodes to sap_hypervisor_node_preconfigure_setup_worker_nodes --- .../tasks/platform/redhat_ocp_virt/main.yml | 4 +++- .../vars/platform_defaults_redhat_ocp_virt.yml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/main.yml b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/main.yml index a3dec29..57ab5ff 100644 --- a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/main.yml +++ b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/main.yml @@ -81,9 +81,11 @@ - name: Include install virtctl ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/install-virtctl.yml" +- debug: var=sap_hypervisor_node_preconfigure_setup_worker_nodes + - name: Include setup worker nodes ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/setup-worker-nodes.yml" - when: sap_hypervisor_node_preconfigure_setup_workers + when: sap_hypervisor_node_preconfigure_setup_worker_nodes # How to wait for node to be scheduleable? (NodeSchedulable) - name: Wait for all k8s nodes to be ready diff --git a/roles/sap_hypervisor_node_preconfigure/vars/platform_defaults_redhat_ocp_virt.yml b/roles/sap_hypervisor_node_preconfigure/vars/platform_defaults_redhat_ocp_virt.yml index 6bfd827..0d1fedf 100644 --- a/roles/sap_hypervisor_node_preconfigure/vars/platform_defaults_redhat_ocp_virt.yml +++ b/roles/sap_hypervisor_node_preconfigure/vars/platform_defaults_redhat_ocp_virt.yml @@ -9,7 +9,7 @@ sap_hypervisor_node_preconfigure_install_hpp: false sap_hypervisor_node_preconfigure_install_trident: false # URL of the trident installer package to use -sap_hypervisor_node_preconfigure_install_trident_url: https://github.com/NetApp/trident/releases/download/v23.01.0/trident-installer-23.01.0.tar.gz +sap_hypervisor_node_preconfigure_install_trident_url: https://github.com/NetApp/trident/releases/download/v23.10.0/trident-installer-23.10.0.tar.gz # should SRIOV be enabled for unsupported NICs sap_hypervisor_node_preconfigure_sriov_enable_unsupported_nics: true @@ -27,4 +27,4 @@ sap_hypervisor_node_preconfigure_ignore_minimal_memory_check: false sap_hypervisor_node_preconfigure_install_operators: true # Configure the workers? -sap_hypervisor_node_preconfigure_setup_workers: true +sap_hypervisor_node_preconfigure_setup_worker_nodes: true From 19535371fcf9b9b8cad0c0b9aa9c70eee250c4a6 Mon Sep 17 00:00:00 2001 From: Nils Koenig Date: Tue, 5 Mar 2024 13:03:59 +0000 Subject: [PATCH 2/2] removed debug print --- .../tasks/platform/redhat_ocp_virt/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/main.yml b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/main.yml index 57ab5ff..89b67c9 100644 --- a/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/main.yml +++ b/roles/sap_hypervisor_node_preconfigure/tasks/platform/redhat_ocp_virt/main.yml @@ -81,8 +81,6 @@ - name: Include install virtctl ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/install-virtctl.yml" -- debug: var=sap_hypervisor_node_preconfigure_setup_worker_nodes - - name: Include setup worker nodes ansible.builtin.include_tasks: "platform/{{ sap_hypervisor_node_platform }}/setup-worker-nodes.yml" when: sap_hypervisor_node_preconfigure_setup_worker_nodes