From 57a62789f6df12998784167c1cb5d0764ef6e9a7 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 19 Apr 2018 14:49:09 +0400 Subject: Disable cpu pinning & L3 HA features * CPU pinning: tests have no support for dedicated CPU policy, so enabled pinning causes general performance impact [https://docs.openstack.org/nova/pike/admin/cpu-topologies.html] * L3 HA routers: - doesn't catch l3-agent failure, relies only on HA network state to spot failure - failover process only retains the state of network connections for instances with a floating IP address - incompatible with DVR mode JIRA: FUEL-360 Change-Id: Ie0182bf953b9989729f89d705d9fee902d229e51 Signed-off-by: Michael Polenchuk (cherry picked from commit ed7bb355c93af5c163d5ae7926012652021abf75) --- .../classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 | 4 ---- mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 | 1 - 2 files changed, 5 deletions(-) (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-ha') 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 412ca4811..583dd6a46 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' -- cgit 1.2.3-korg