From 5bde8d66b7a2d62e53c5978e8f4d8d6752d2cb24 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 (cherry picked from commit c6a4fcf01b5bcb0533d552d761f7462190df44b7) --- mcp/config/scenario/os-nosdn-fdio-ha.yaml | 45 +++++++++++++++++++++++++++++ mcp/config/scenario/os-nosdn-fdio-noha.yaml | 27 +++++++++++++++++ mcp/config/scenario/os-nosdn-vpp-ha.yaml | 45 ----------------------------- mcp/config/scenario/os-nosdn-vpp-noha.yaml | 27 ----------------- 4 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 mcp/config/scenario/os-nosdn-fdio-ha.yaml create mode 100644 mcp/config/scenario/os-nosdn-fdio-noha.yaml delete mode 100644 mcp/config/scenario/os-nosdn-vpp-ha.yaml delete mode 100644 mcp/config/scenario/os-nosdn-vpp-noha.yaml (limited to 'mcp/config/scenario') diff --git a/mcp/config/scenario/os-nosdn-fdio-ha.yaml b/mcp/config/scenario/os-nosdn-fdio-ha.yaml new file mode 100644 index 000000000..3ff4e5c5d --- /dev/null +++ b/mcp/config/scenario/os-nosdn-fdio-ha.yaml @@ -0,0 +1,45 @@ +############################################################################## +# 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 +############################################################################## +--- +cluster: + domain: mcp-fdio-ha.local + states: + - openstack_ha + - networks +virtual: + nodes: + control: + - kvm01 + - kvm02 + - kvm03 + compute: + - cmp001 + - cmp002 + # Below values are only used for each node if said node is virtual + cfg01: + vcpus: 4 + ram: 6144 + mas01: + vcpus: 4 + ram: 6144 + # NOTE: We might need to add more RAM here + kvm01: + vcpus: 4 + ram: 14336 + kvm02: + vcpus: 4 + ram: 14336 + kvm03: + vcpus: 4 + ram: 14336 + cmp001: + vcpus: 4 + ram: 8192 + cmp002: + vcpus: 4 + ram: 8192 diff --git a/mcp/config/scenario/os-nosdn-fdio-noha.yaml b/mcp/config/scenario/os-nosdn-fdio-noha.yaml new file mode 100644 index 000000000..b52a89cf4 --- /dev/null +++ b/mcp/config/scenario/os-nosdn-fdio-noha.yaml @@ -0,0 +1,27 @@ +############################################################################## +# 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 +############################################################################## +--- +cluster: + domain: mcp-fdio-noha.local + states: + - openstack_noha + - neutron_gateway + - networks +virtual: + nodes: + control: + - ctl01 + - gtw01 + compute: + - cmp001 + - cmp002 + ctl01: + vcpus: 4 + ram: 14336 + gtw01: + ram: 2048 diff --git a/mcp/config/scenario/os-nosdn-vpp-ha.yaml b/mcp/config/scenario/os-nosdn-vpp-ha.yaml deleted file mode 100644 index 9e7ebc1e2..000000000 --- a/mcp/config/scenario/os-nosdn-vpp-ha.yaml +++ /dev/null @@ -1,45 +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 -############################################################################## ---- -cluster: - domain: mcp-vpp-ha.local - states: - - openstack_ha - - networks -virtual: - nodes: - control: - - kvm01 - - kvm02 - - kvm03 - compute: - - cmp001 - - cmp002 - # Below values are only used for each node if said node is virtual - cfg01: - vcpus: 4 - ram: 6144 - mas01: - vcpus: 4 - ram: 6144 - # NOTE: We might need to add more RAM here - kvm01: - vcpus: 4 - ram: 14336 - kvm02: - vcpus: 4 - ram: 14336 - kvm03: - vcpus: 4 - ram: 14336 - cmp001: - vcpus: 4 - ram: 8192 - cmp002: - vcpus: 4 - ram: 8192 diff --git a/mcp/config/scenario/os-nosdn-vpp-noha.yaml b/mcp/config/scenario/os-nosdn-vpp-noha.yaml deleted file mode 100644 index e90300407..000000000 --- a/mcp/config/scenario/os-nosdn-vpp-noha.yaml +++ /dev/null @@ -1,27 +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 -############################################################################## ---- -cluster: - domain: mcp-vpp-noha.local - states: - - openstack_noha - - neutron_gateway - - networks -virtual: - nodes: - control: - - ctl01 - - gtw01 - compute: - - cmp001 - - cmp002 - ctl01: - vcpus: 4 - ram: 14336 - gtw01: - ram: 2048 -- cgit 1.2.3-korg