From c6a4fcf01b5bcb0533d552d761f7462190df44b7 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 13 Dec 2018 15:05:35 +0100 Subject: [docs] Updates for Gambia 7.1.0 release While at it, rename FDIO (VPP) scenarios to align with OPNFV FDS and OPNFV Apex projects. Change-Id: I9aab5dc4a0dc41a2cc996687a8a2726d03288678 Signed-off-by: Alexandru Avadanii --- .../classes/cluster/mcp-vpp-ha/infra/config.yml | 12 -------- .../classes/cluster/mcp-vpp-ha/infra/init.yml | 14 --------- .../cluster/mcp-vpp-ha/infra/init_vcp.yml.j2 | 12 -------- .../classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2 | 14 --------- .../classes/cluster/mcp-vpp-ha/infra/maas.yml | 11 ------- mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml | 12 -------- .../cluster/mcp-vpp-ha/openstack/compute.yml | 17 ---------- .../mcp-vpp-ha/openstack/compute_pdf.yml.j2 | 36 ---------------------- .../cluster/mcp-vpp-ha/openstack/control.yml | 13 -------- .../cluster/mcp-vpp-ha/openstack/database.yml | 12 -------- .../classes/cluster/mcp-vpp-ha/openstack/init.yml | 13 -------- .../cluster/mcp-vpp-ha/openstack/message_queue.yml | 12 -------- .../classes/cluster/mcp-vpp-ha/openstack/proxy.yml | 12 -------- .../cluster/mcp-vpp-ha/openstack/telemetry.yml | 12 -------- 14 files changed, 202 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml (limited to 'mcp/reclass/classes/cluster/mcp-vpp-ha') diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml deleted file mode 100644 index 06347bf22..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# 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-ha.infra.config - - cluster.mcp-vpp-ha.infra - - cluster.all-mcp-arch-common.infra.config_pdf diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init.yml deleted file mode 100644 index a434ef7c1..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init.yml +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################## -# 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-ha.infra - - cluster.mcp-vpp-ha.openstack -parameters: - _param: - cluster_name: mcp-vpp-ha diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2 deleted file mode 100644 index 21d2e42ce..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2 +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -{%- if conf.MCP_VCP %} -classes: - - cluster.mcp-vpp-ha.infra -{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2 deleted file mode 100644 index 2f72c4178..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2 +++ /dev/null @@ -1,14 +0,0 @@ -############################################################################## -# 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 -############################################################################## ---- -{%- if conf.MCP_VCP %} -# NOTE(armband): we don't want to pull in salt.control for novcp -classes: - - cluster.mcp-common-ha.infra.kvm - - cluster.mcp-vpp-ha.infra -{%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml deleted file mode 100644 index b2b66992c..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# 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.all-mcp-arch-common.infra.maas - - cluster.mcp-vpp-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml deleted file mode 100644 index dc6b8bfef..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# 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.all-mcp-arch-common - - cluster.mcp-vpp-ha.infra - - cluster.mcp-vpp-ha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml deleted file mode 100644 index 0518a8b57..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################## -# 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-ha.openstack_compute - - cluster.mcp-vpp-ha.openstack.compute_pdf - - cluster.mcp-vpp-ha.infra -parameters: - nova: - compute: - libvirt_service: libvirtd - libvirt_bin: /etc/default/libvirtd diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2 deleted file mode 100644 index f3844ad8c..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2 +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################## -# 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 -############################################################################## -{%- import 'net_map.j2' as nm with context %} -{%- import 'net_macros.j2' as ma with context %} -{#- Filter-out NIC duplicates by constructing a dict (used NICs only) #} -{%- set nics = { nm.cmp001.nic_private: True } %} -{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %} -{%- set vlans = { vlan_private_start: nm.cmp001.nic_private } %} ---- -parameters: - linux: - network: - interface: - -{#- prevent duplicates for tagged mgmt on the same physical interface as PXE/admin #} -{%- if nm.cmp001.nic_admin in nics %} - {%- do nics.pop(nm.cmp001.nic_admin) %} -{%- endif %} - -{{ ma.linux_network_interfaces_nic(nics) }} - -{{ ma.linux_network_interfaces_vlan(vlans) }} - - br-mesh: - enabled: true - type: bridge - address: ${_param:tenant_address} - netmask: ${_param:opnfv_net_private_mask} - mtu: 1500 - use_interfaces: - - {{ ma.interface_str(nm.cmp001.nic_private, vlan_private_start) }} diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml deleted file mode 100644 index 9bca1f084..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################## -# 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.cluster - - cluster.mcp-common-ha.openstack_interface_vcp_biport - - cluster.mcp-common-ha.openstack_control - - cluster.mcp-vpp-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml deleted file mode 100644 index a75fa675b..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# 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-ha.openstack_interface_vcp_biport - - cluster.mcp-common-ha.openstack_database - - cluster.mcp-vpp-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml deleted file mode 100644 index 9dbfd59a1..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################## -# 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-ha.openstack_init -parameters: - _param: - neutron_tenant_network_types: "flat,vxlan" diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml deleted file mode 100644 index 42a1b658e..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# 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-ha.openstack_interface_vcp_biport - - cluster.mcp-common-ha.openstack_message_queue - - cluster.mcp-vpp-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml deleted file mode 100644 index 3a82e51a6..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# 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-ha.openstack_interface_vcp_triport - - cluster.mcp-common-ha.openstack_proxy - - cluster.mcp-vpp-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml deleted file mode 100644 index 402616868..000000000 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# 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-ha.openstack_interface_vcp_biport - - cluster.mcp-common-ha.openstack_telemetry - - cluster.mcp-vpp-ha.infra.init_vcp -- cgit 1.2.3-korg