diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-23 15:21:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-23 15:21:41 +0000 |
| commit | 6e28bcea8eca57d6befae2cd272a39564b0311e5 (patch) | |
| tree | f23765b7b6318a4b3eb87039a3e2822f1ee3e394 /mcp/reclass/classes/cluster/mcp-pike-common-ha | |
| parent | 9066a682aed937d566f661e975070855aafe5d8f (diff) | |
| parent | 57a62789f6df12998784167c1cb5d0764ef6e9a7 (diff) | |
Merge "Disable cpu pinning & L3 HA features" into stable/fraser
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-ha')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 | 4 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 | 1 |
2 files changed, 0 insertions, 5 deletions
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' |