From 09dce2a2643223d66aa1ac3a0ad8feebc082f521 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 28 Nov 2017 20:27:05 +0100 Subject: Rename reclass models to add "-ha" or "-noha" Parse all reclass j2 templates, not only common + current scenario (useful when adding new scenarios later). JIRA: FUEL-310 Change-Id: I8e87af702f83c42cb8f766bf6f121449aa5f2c26 Signed-off-by: Alexandru Avadanii --- .../infra/config.yml | 23 ++++++++++++++ .../virtual-mcp-pike-ovs-dpdk-noha/init.yml | 19 +++++++++++ .../openstack/compute.yml | 37 ++++++++++++++++++++++ .../openstack/control.yml | 17 ++++++++++ .../openstack/gateway.yml | 26 +++++++++++++++ .../openstack/init.yml | 21 ++++++++++++ 6 files changed, 143 insertions(+) create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/gateway.yml create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/init.yml (limited to 'mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha') diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml new file mode 100644 index 000000000..70dcd2f8a --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/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-noha.infra.config + - cluster.virtual-mcp-pike-ovs-dpdk-noha +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-noha/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml new file mode 100644 index 000000000..e6a7da4df --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/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-noha.init_options + - cluster.virtual-mcp-pike-common-noha.infra + - cluster.virtual-mcp-pike-ovs-dpdk-noha.openstack + +parameters: + _param: + cluster_domain: virtual-mcp-pike-ovs-dpdk-noha.local + cluster_name: virtual-mcp-pike-ovs-dpdk-noha 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 new file mode 100644 index 000000000..0f53477eb --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml @@ -0,0 +1,37 @@ +############################################################################## +# 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.nova.compute.nfv.hugepages + - system.neutron.compute.nfv.dpdk + - cluster.virtual-mcp-pike-common-noha.openstack_compute + - cluster.virtual-mcp-pike-ovs-dpdk-noha +parameters: + neutron: + compute: + backend: + 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} + 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-noha/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/control.yml new file mode 100644 index 000000000..4dbaae829 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/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-noha.openstack_control + - cluster.virtual-mcp-pike-ovs-dpdk-noha +parameters: + neutron: + server: + backend: + tenant_vlan_range: 1000:1999 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/gateway.yml new file mode 100644 index 000000000..ec943a857 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/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-noha.openstack_gateway + - service.neutron.gateway.single + - cluster.virtual-mcp-pike-ovs-dpdk-noha +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-noha/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/init.yml new file mode 100644 index 000000000..5445a07ea --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/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-noha.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