From afae8d4d99d962448eb62cdd306f7a3dcda83744 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 4 Jun 2018 17:55:52 +0400 Subject: [noha] Update OpenStack version to Queens * make cluster names version-agnostic * pre-install oslo-templates formula * salt version update to 2017.7 * system reclass update Change-Id: I903895f6bcd98a1062e66e3f14d23ec04dc1b869 Signed-off-by: Michael Polenchuk --- .../cluster/mcp-ovs-dpdk-noha/infra/config.yml | 21 +++++++++++++ .../cluster/mcp-ovs-dpdk-noha/infra/init.yml | 14 +++++++++ .../classes/cluster/mcp-ovs-dpdk-noha/init.yml | 13 ++++++++ .../mcp-ovs-dpdk-noha/openstack/compute.yml | 35 ++++++++++++++++++++++ .../mcp-ovs-dpdk-noha/openstack/control.yml | 17 +++++++++++ .../mcp-ovs-dpdk-noha/openstack/gateway.yml | 26 ++++++++++++++++ .../cluster/mcp-ovs-dpdk-noha/openstack/init.yml | 13 ++++++++ 7 files changed, 139 insertions(+) create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/init.yml (limited to 'mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha') diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/config.yml new file mode 100644 index 000000000..08c23026f --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/config.yml @@ -0,0 +1,21 @@ +############################################################################## +# Copyright (c) 2018 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.reclass.storage.system.openstack_gateway_single + - cluster.mcp-common-noha.infra.config + - cluster.mcp-ovs-dpdk-noha + - cluster.all-mcp-arch-common.infra.config_dpdk_pdf +parameters: + reclass: + storage: + node: + openstack_gateway_node01: + params: + tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} + external_address: ${_param:opnfv_openstack_gateway_node01_external_address} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/init.yml new file mode 100644 index 000000000..f27c310ac --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/init.yml @@ -0,0 +1,14 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-noha.infra + +parameters: + _param: + cluster_name: mcp-ovs-dpdk-noha diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml new file mode 100644 index 000000000..96e2c9425 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml @@ -0,0 +1,13 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-noha.init_options + - cluster.mcp-ovs-dpdk-noha.infra + - cluster.mcp-ovs-dpdk-noha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml new file mode 100644 index 000000000..a4d6b8dd2 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2018 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 + - service.neutron.compute.single + - cluster.mcp-common-noha.openstack_compute + - cluster.mcp-ovs-dpdk-noha +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: ${_param:dpdk0_driver} + enabled: true + bridge: br-prv + type: dpdk_ovs_port + n_rxq: ${_param:dpdk0_n_rxq} + br-prv: + enabled: true + type: dpdk_ovs_bridge + tenant_interface: + type: dpdk # Not a meaningful type, just match 'dpdk' for filtering diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/control.yml new file mode 100644 index 000000000..bbd4d7cc2 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/control.yml @@ -0,0 +1,17 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-noha.openstack_control + - cluster.mcp-ovs-dpdk-noha +parameters: + neutron: + server: + backend: + tenant_vlan_range: ${_param:opnfv_net_tenant_vlan} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml new file mode 100644 index 000000000..2f9aee6fd --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml @@ -0,0 +1,26 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-noha.openstack_gateway + - service.neutron.gateway.single + - cluster.mcp-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/mcp-ovs-dpdk-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/init.yml new file mode 100644 index 000000000..835d15a41 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/init.yml @@ -0,0 +1,13 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-noha.openstack_init +parameters: + _param: + neutron_tenant_network_types: "flat,vlan" -- cgit 1.2.3-korg