From 6e8671fba4bd1d29836695760b5b219ef0123e2e Mon Sep 17 00:00:00 2001 From: "Michael S. Pedersen" Date: Tue, 16 Feb 2021 08:23:52 +0000 Subject: Update BMRA to v2.1 Updated Kuberef to use BMRA v2.1 instead of v2.0. Removed a few workarounds used for BMRA v2.0. Updated a few dependencies in deployment container. Updated Kuberef templates for BMRA configuration. Signed-off-by: Michael S. Pedersen Change-Id: I091da09277ca9ecc0d3d7574dc3c4f000e73432d Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/72064 Tested-by: jenkins-ci Reviewed-by: Rihab Banday --- playbooks/roles/bmra-config/templates/all.j2 | 2 +- playbooks/roles/bmra-config/templates/inventory.j2 | 2 +- playbooks/roles/bmra-config/templates/kube-node.j2 | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'playbooks/roles') diff --git a/playbooks/roles/bmra-config/templates/all.j2 b/playbooks/roles/bmra-config/templates/all.j2 index 1017331..6dc074e 100644 --- a/playbooks/roles/bmra-config/templates/all.j2 +++ b/playbooks/roles/bmra-config/templates/all.j2 @@ -65,7 +65,7 @@ topology_manager_policy: "{{ bmra.features.topology_manager.policy }}" sriov_net_dp_enabled: {{ bmra.features.sriov_net_dp }} sriov_net_dp_namespace: kube-system # whether to build and store image locally or use one from public external registry -sriov_net_dp_build_image_locally: false +sriov_net_dp_build_image_locally: true # SR-IOV network device plugin configuration. # For more information on supported configuration refer to: https://github.com/intel/sriov-network-device-plugin#configurations sriovdp_config_data: | diff --git a/playbooks/roles/bmra-config/templates/inventory.j2 b/playbooks/roles/bmra-config/templates/inventory.j2 index 28581e0..6008179 100644 --- a/playbooks/roles/bmra-config/templates/inventory.j2 +++ b/playbooks/roles/bmra-config/templates/inventory.j2 @@ -2,7 +2,7 @@ {% for node in nodes %} {{ idf.kubespray.hostnames[node.name] }} ansible_host={{ node.interfaces[idf.net_config[engine.pxe_network].interface].address }} ip={{ node.interfaces[idf.net_config[engine.pxe_network].interface].address }} {% endfor %} -localhost +localhost ansible_python_interpreter=/usr/bin/python2 {% for role in ['kube-master', 'etcd', 'kube-node'] %} [{{ role }}] diff --git a/playbooks/roles/bmra-config/templates/kube-node.j2 b/playbooks/roles/bmra-config/templates/kube-node.j2 index 302fa8f..f32fbdb 100644 --- a/playbooks/roles/bmra-config/templates/kube-node.j2 +++ b/playbooks/roles/bmra-config/templates/kube-node.j2 @@ -16,11 +16,11 @@ --- # Kubernetes node configuration -# Enable SR-IOV networking related setup -sriov_enabled: {{ bmra.features.sriov.enable }} +# Enable IOMMU (required for SR-IOV networking) +iommu_enabled: {{ bmra.features.sriov.enable }} -# SR-IOV PF specific configuration list -sriov_nics: +# dataplane interface configuration list +dataplane_interfaces: {% for intf in bmra.network_roles.sriov %} - name: {{ intf.name }} bus_info: "{{ intf.bus_info }}" @@ -41,8 +41,8 @@ sriov_cni_enabled: {{ bmra.features.sriov_cni }} # Bond CNI bond_cni_enabled: false -# install DPDK -install_dpdk: true # DPDK installation is required for sriov_enabled:true; default to false +# Install DPDK (required for SR-IOV networking) +install_dpdk: true # Userspace networking userspace_cni_enabled: false @@ -62,10 +62,10 @@ update_nic_drivers: false update_nic_firmware: false # Additional list of NIC interfaces that the FW update will be executed on -# NOTE: FW update will be also executed on all NICs listed in "sriov_nics[*].name" -firmware_update_nics: - - intf1 - - intf2 +# NOTE: FW update will be also executed on all NICs listed in "dataplane_interfaces[*].name" +firmware_update_nics: [] +# - enp24s0f0 +# - enp24s0f1 # install Intel x700 & x800 series NICs DDP packages install_ddp_packages: false @@ -93,7 +93,7 @@ cpu_count: 144 # Enable/Disable Intel PState scaling driver intel_pstate_enabled: true # Config options for intel_pstate: disable, passive, force, no_hwp, hwp_only, support_acpi_ppc, per_cpu_perf_limits -intel_pstate: disable +intel_pstate: hwp_only # Enable/Disable Intel Turbo Boost PState attribute turbo_boost_enabled: false -- cgit 1.2.3-korg