Merge "Disable cpu pinning & L3 HA features" into stable/fraser

5 files changed, 5 insertions, 9 deletions

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2
index 6cf04b33a..703d5350e 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_dpdk_pdf.yml.j2
@@ -24,11 +24,10 @@ parameters:
 {%- endfor %}
 {%- endif %}
 {%- else %}
-            nova_cpu_pinning: '"5-7,13-15"'
             compute_hugepages_size: 2M
             compute_hugepages_count: 8192
             compute_hugepages_mount: /mnt/hugepages_2M
-            compute_kernel_isolcpu: 2,3,5,6,7,10,11,13,14,15
+            compute_kernel_isolcpu: 2,3,10,11
             compute_dpdk_driver: uio
             compute_ovs_pmd_cpu_mask: '"0xc04"'
             compute_ovs_dpdk_socket_mem: '"2048,2048"'
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
index 477c0957b..fb25cc617 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
@@ -25,11 +25,9 @@ parameters:
             dummy_value: ~
 {%- endif %}
 {%- else %}
-            nova_cpu_pinning: &nova_cpu_pinning_common '"1,2,3,4,5,7,8,9,10,11"'
             compute_hugepages_size: 1G
             compute_hugepages_count: 16
             compute_hugepages_mount: /mnt/hugepages_1G
-            compute_kernel_isolcpu: *nova_cpu_pinning_common
 {%- endif %}
         openstack_compute_node02:
           <<: *openstack_compute_node01
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2
index 998253c8f..fd51f5fea 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2
@@ -11,10 +11,6 @@
 {%- set nics = { nm.cmp001.nic_admin: True, nm.cmp001.nic_mgmt: True } %}
 {%- set vlans = { nm.vlan_admin: nm.cmp001.nic_admin, nm.vlan_mgmt: nm.cmp001.nic_mgmt } %}
 ---
-{%- if not conf.nodes[nm.cmp001.idx].node.type == 'virtual' %}
-classes:
-  - system.nova.compute.nfv.cpu_pinning
-{%- endif %}
 parameters:
   _param:
     # Should later be determined via PDF/IDF, AArch64 has ESP on /dev/sda1
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
index 603056622..f6533855b 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
@@ -137,7 +137,6 @@ parameters:
     admin_email: root@localhost
     # Neutron osv/nodvr
     neutron_control_dvr: 'False'
-    neutron_l3_ha: 'True'
     neutron_global_physnet_mtu: 1500
     neutron_external_mtu: 1500
     neutron_gateway_dvr: 'False'
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute.yml
index 13fffeaaa..d121c0807 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute.yml
@@ -22,3 +22,7 @@ parameters:
     compute:
       libvirt_service: libvirtd
       libvirt_bin: /etc/default/libvirtd
+  linux:
+    system:
+      kernel:
+        isolcpu: ${_param:compute_kernel_isolcpu}