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 --- .../openstack/compute.yml | 34 ---------------------- .../openstack/control.yml | 17 ----------- .../openstack/gateway.yml | 26 ----------------- .../virtual-mcp-ocata-ovs-dpdk/openstack/init.yml | 21 ------------- 4 files changed, 98 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml (limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack') diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml deleted file mode 100644 index ba6577e0d..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml +++ /dev/null @@ -1,34 +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: - - 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-ocata-common.openstack_compute - - cluster.virtual-mcp-ocata-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-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml deleted file mode 100644 index 780f66427..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml +++ /dev/null @@ -1,17 +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: - - system.neutron.control.openvswitch.single - - cluster.virtual-mcp-ocata-common.openstack_control - - cluster.virtual-mcp-ocata-ovs-dpdk -parameters: - neutron: - server: - backend: - tenant_vlan_range: 1000:1999 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml deleted file mode 100644 index 4f215e807..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml +++ /dev/null @@ -1,26 +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.virtual-mcp-ocata-common.openstack_gateway - - service.neutron.gateway.single - - cluster.virtual-mcp-ocata-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-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml deleted file mode 100644 index c27f73b05..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml +++ /dev/null @@ -1,21 +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.virtual-mcp-ocata-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