From 2bd6a0ed390285ec8f17cc8c71a9147485ca860b Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 26 Jan 2018 17:52:31 +0400 Subject: [ovs/dpdk] Configure vxlan for baremetal scenario * switch ovs/dpdk scenario from vlan to vxlan mode * force br-ex interface to mitigate race with incorrect state * remove dpdk packages list (already in upstream) Change-Id: Ib827cef2d67879fd2a86d286ca2118b22493274d Signed-off-by: Michael Polenchuk --- .../openstack/compute.yml | 42 ------------------- .../openstack/compute.yml.j2 | 47 ++++++++++++++++++++++ .../openstack/init.yml | 2 +- .../openstack/compute.yml | 5 --- 4 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml.j2 (limited to 'mcp/reclass/classes/cluster') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml deleted file mode 100644 index cfe92020d..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.baremetal-mcp-pike-common-ha.openstack_compute - - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra - - system.neutron.compute.nfv.dpdk -parameters: - neutron: - gateway: - dpdk: 'True' - vhost_socket_dir: ${_param:compute_ovs_vhost_socket_dir} - backend: - tenant_vlan_range: ${_param:neutron_tenant_vlan_range} - nova: - compute: - libvirt_service: libvirtd - libvirt_bin: /etc/default/libvirtd - linux: - network: - dpdk_pkgs: - - dpdk - - dpdk-dev - - dpdk-igb-uio-dkms - - dpdk-rte-kni-dkms - interface: - dpdk0: - name: ${_param:dpdk0_name} - pci: ${_param:dpdk0_pci} - driver: igb_uio - enabled: true - bridge: br-prv - type: dpdk_ovs_port - n_rxq: 2 - br-prv: - enabled: true - type: dpdk_ovs_bridge diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml.j2 new file mode 100644 index 000000000..76fa17946 --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml.j2 @@ -0,0 +1,47 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +{%- if conf.idf is defined and conf.idf.net_config is defined -%} + {%- set vlan_private = conf['idf']['net_config']['private']['vlan'] -%} +{%- else -%} + {%- set vlan_private = '1000' -%} +{%- endif -%} +--- +classes: + - cluster.baremetal-mcp-pike-common-ha.openstack_compute + - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra + - system.neutron.compute.nfv.dpdk +parameters: + neutron: + gateway: + dpdk: 'True' + vhost_socket_dir: ${_param:compute_ovs_vhost_socket_dir} + backend: + tenant_vlan_range: ${_param:neutron_tenant_vlan_range} + nova: + compute: + libvirt_service: libvirtd + libvirt_bin: /etc/default/libvirtd + linux: + network: + interface: + dpdk0: + name: ${_param:dpdk0_name} + pci: ${_param:dpdk0_pci} + driver: igb_uio + enabled: true + bridge: br-prv + type: dpdk_ovs_port + n_rxq: 2 + br-prv: + enabled: true + type: dpdk_ovs_bridge + address: ${_param:tenant_address} + netmask: 255.255.255.0 + {%- if vlan_private and vlan_private != 'native' %} + tag: {{ vlan_private }} + {%- endif %} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml index 7d85fda41..49af851cc 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml @@ -10,7 +10,7 @@ classes: - cluster.baremetal-mcp-pike-common-ha.openstack_init parameters: _param: - neutron_tenant_network_types: "flat,vlan" + neutron_tenant_network_types: "flat,vxlan" neutron_tenant_vlan_range: "1000:1030" nova_cpu_pinning: "5-7,13-15" compute_hugepages_size: 2M diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml index 819fa5efa..c59cdaade 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml @@ -19,11 +19,6 @@ parameters: tenant_network_types: ${_param:neutron_tenant_network_types} linux: network: - dpdk_pkgs: - - dpdk - - dpdk-dev - - dpdk-igb-uio-dkms - - dpdk-rte-kni-dkms interface: dpdk0: name: ${_param:dpdk0_name} -- cgit 1.2.3-korg