From 8726a0d7ed8286d1aa86523a4acf61d9d4b4c9cd Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 20 Nov 2017 15:50:53 +0400 Subject: [virtual] Update openstack version to pike Change-Id: I1df0228cb44bf9122aaf93dd25fc16a0d26a5240 Signed-off-by: Michael Polenchuk --- .../virtual-mcp-pike-ovs-dpdk/infra/config.yml | 23 +++++++++++++++ .../cluster/virtual-mcp-pike-ovs-dpdk/init.yml | 19 ++++++++++++ .../openstack/compute.yml | 34 ++++++++++++++++++++++ .../openstack/control.yml | 17 +++++++++++ .../openstack/gateway.yml | 26 +++++++++++++++++ .../virtual-mcp-pike-ovs-dpdk/openstack/init.yml | 21 +++++++++++++ 6 files changed, 140 insertions(+) create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml (limited to 'mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk') diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml new file mode 100644 index 000000000..a346bacab --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml @@ -0,0 +1,23 @@ +############################################################################## +# 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.virtual-mcp-pike-common.infra.config + - cluster.virtual-mcp-pike-ovs-dpdk +parameters: + reclass: + storage: + node: + openstack_compute_node01: + params: + dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface} + dpdk0_pci: '"0000:00:05.0"' + openstack_compute_node02: + params: + dpdk0_name: ${_param:opnfv_fn_vm_tertiary_interface} + dpdk0_pci: '"0000:00:05.0"' diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml new file mode 100644 index 000000000..66d5e3fbd --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml @@ -0,0 +1,19 @@ +############################################################################## +# 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: + - system.linux.system.single + - cluster.all-mcp-arch-common + - cluster.virtual-mcp-pike-common.init_options + - cluster.virtual-mcp-pike-common.infra + - cluster.virtual-mcp-pike-ovs-dpdk.openstack + +parameters: + _param: + cluster_domain: virtual-mcp-pike-ovs-dpdk.local + cluster_name: virtual-mcp-pike-ovs-dpdk diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml new file mode 100644 index 000000000..72fe43a84 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml @@ -0,0 +1,34 @@ +############################################################################## +# 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: + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.nova.compute.nfv.hugepages + - system.neutron.compute.nfv.dpdk + - cluster.virtual-mcp-pike-common.openstack_compute + - cluster.virtual-mcp-pike-ovs-dpdk +parameters: + neutron: + compute: + backend: + tenant_network_types: ${_param:neutron_tenant_network_types} + 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 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml new file mode 100644 index 000000000..b368a2c68 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml @@ -0,0 +1,17 @@ +############################################################################## +# 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: + - system.neutron.control.openvswitch.single + - cluster.virtual-mcp-pike-common.openstack_control + - cluster.virtual-mcp-pike-ovs-dpdk +parameters: + neutron: + server: + backend: + tenant_vlan_range: 1000:1999 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml new file mode 100644 index 000000000..07691fbf7 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml @@ -0,0 +1,26 @@ +############################################################################## +# 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.virtual-mcp-pike-common.openstack_gateway + - service.neutron.gateway.single + - cluster.virtual-mcp-pike-ovs-dpdk +parameters: + neutron: + gateway: + backend: + tenant_network_types: ${_param:neutron_tenant_network_types} + linux: + network: + interface: + tenant_interface: + ovs_bridge: br-prv + br-prv: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml new file mode 100644 index 000000000..02d24caac --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml @@ -0,0 +1,21 @@ +############################################################################## +# 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.virtual-mcp-pike-common.openstack_init +parameters: + _param: + neutron_tenant_network_types: "flat,vlan" + compute_hugepages_size: 2M + compute_hugepages_count: 2048 + compute_hugepages_mount: /mnt/hugepages_2M + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0x6" + compute_ovs_dpdk_socket_mem: "1024" + compute_ovs_dpdk_lcore_mask: "0x8" + compute_ovs_memory_channels: "2" -- cgit 1.2.3-korg