From f6cae340635775ecd339a08e78ef583ecca092ec Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 1 Sep 2018 23:49:08 +0200 Subject: [scenario] Factor out common nodes, states Make the bulk of scenario files static again by shifting out all common virtual nodes (mas01) and states (virtual_init, maas etc.) to default.yaml(.j2). This allows us to parse scenario-specific data during first j2 expansion, preparing for the new Pharos installer adapter that relies on `conf.virtual.nodes.control` length to construct the proper list of MaaS node definitions (kvm{01,02,03} vs {ctl01,gtw01}). Change-Id: I666ab5bd6bb2a42f98646af51950f6b9fffa0e8b Signed-off-by: Alexandru Avadanii --- mcp/config/scenario/.gitignore | 2 +- mcp/config/scenario/defaults.yaml | 52 ---------------- mcp/config/scenario/defaults.yaml.j2 | 71 ++++++++++++++++++++++ mcp/config/scenario/os-nosdn-nofeature-ha.yaml | 42 +++++++++++++ mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 | 55 ----------------- mcp/config/scenario/os-nosdn-nofeature-noha.yaml | 27 ++++++++ .../scenario/os-nosdn-nofeature-noha.yaml.j2 | 37 ----------- mcp/config/scenario/os-nosdn-ovs-ha.yaml | 43 +++++++++++++ mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 | 56 ----------------- mcp/config/scenario/os-nosdn-ovs-noha.yaml | 34 +++++++++++ mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 | 44 -------------- mcp/config/scenario/os-nosdn-vpp-ha.yaml | 45 ++++++++++++++ mcp/config/scenario/os-nosdn-vpp-ha.yaml.j2 | 58 ------------------ mcp/config/scenario/os-nosdn-vpp-noha.yaml | 27 ++++++++ mcp/config/scenario/os-nosdn-vpp-noha.yaml.j2 | 37 ----------- mcp/config/scenario/os-odl-nofeature-ha.yaml | 43 +++++++++++++ mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 | 56 ----------------- mcp/config/scenario/os-odl-nofeature-noha.yaml | 32 ++++++++++ mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 | 42 ------------- mcp/config/scenario/os-odl-ovs-noha.yaml | 39 ++++++++++++ mcp/config/scenario/os-odl-ovs-noha.yaml.j2 | 49 --------------- mcp/config/scenario/os-ovn-nofeature-ha.yaml | 42 +++++++++++++ mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 | 55 ----------------- mcp/config/scenario/os-ovn-nofeature-noha.yaml | 29 +++++++++ mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 | 39 ------------ mcp/scripts/xdf_data.sh.j2 | 3 +- 26 files changed, 477 insertions(+), 582 deletions(-) delete mode 100644 mcp/config/scenario/defaults.yaml create mode 100644 mcp/config/scenario/defaults.yaml.j2 create mode 100644 mcp/config/scenario/os-nosdn-nofeature-ha.yaml delete mode 100644 mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 create mode 100644 mcp/config/scenario/os-nosdn-nofeature-noha.yaml delete mode 100644 mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2 create mode 100644 mcp/config/scenario/os-nosdn-ovs-ha.yaml delete mode 100644 mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 create mode 100644 mcp/config/scenario/os-nosdn-ovs-noha.yaml delete mode 100644 mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 create mode 100644 mcp/config/scenario/os-nosdn-vpp-ha.yaml delete mode 100644 mcp/config/scenario/os-nosdn-vpp-ha.yaml.j2 create mode 100644 mcp/config/scenario/os-nosdn-vpp-noha.yaml delete mode 100644 mcp/config/scenario/os-nosdn-vpp-noha.yaml.j2 create mode 100644 mcp/config/scenario/os-odl-nofeature-ha.yaml delete mode 100644 mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 create mode 100644 mcp/config/scenario/os-odl-nofeature-noha.yaml delete mode 100644 mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 create mode 100644 mcp/config/scenario/os-odl-ovs-noha.yaml delete mode 100644 mcp/config/scenario/os-odl-ovs-noha.yaml.j2 create mode 100644 mcp/config/scenario/os-ovn-nofeature-ha.yaml delete mode 100644 mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 create mode 100644 mcp/config/scenario/os-ovn-nofeature-noha.yaml delete mode 100644 mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 diff --git a/mcp/config/scenario/.gitignore b/mcp/config/scenario/.gitignore index a2d43db14..13346b908 100644 --- a/mcp/config/scenario/.gitignore +++ b/mcp/config/scenario/.gitignore @@ -1 +1 @@ -*ha.yaml +defaults.yaml diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml deleted file mode 100644 index db98eb169..000000000 --- a/mcp/config/scenario/defaults.yaml +++ /dev/null @@ -1,52 +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 -############################################################################## ---- -x86_64: - base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img - default: - vcpus: 2 - ram: 4096 - common: - apt: - keys: - - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub - repos: - # deb [arch=] - - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main - pkg: - install: - - linux-generic-hwe-16.04 - - salt-minion - control: - apt: ~ - pkg: - install: - - cloud-init -aarch64: - base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img - default: - vcpus: 6 - ram: 4096 - common: - apt: - keys: - - https://linux.enea.com/mcp-repos/queens/xenial/archive-mcpqueens.key - - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub - repos: - # deb [arch=] - - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main - - armband_3 1201 deb [arch=arm64] http://linux.enea.com/mcp-repos/queens/xenial queens-armband main - pkg: - install: - - python-futures - - salt-minion - control: - apt: ~ - pkg: - install: - - cloud-init diff --git a/mcp/config/scenario/defaults.yaml.j2 b/mcp/config/scenario/defaults.yaml.j2 new file mode 100644 index 000000000..141af4d26 --- /dev/null +++ b/mcp/config/scenario/defaults.yaml.j2 @@ -0,0 +1,71 @@ +############################################################################## +# 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 %} +--- +x86_64: + base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img + default: + vcpus: 2 + ram: 4096 + virtual: &arch_default_virtual_nodes_infra + nodes: + infra: +{%- if nm.cluster.has_baremetal_nodes %} + - mas01 +{%- endif %} + cluster: &arch_default_cluster_states + states: + - virtual_init +{%- if nm.cluster.has_baremetal_nodes %} + - maas + - baremetal_init +{%- if conf.MCP_VCP %} + - virtual_control_plane +{%- endif %} +{%- endif %} + common: + apt: + keys: + - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub + repos: + # deb [arch=] + - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main + pkg: + install: + - linux-generic-hwe-16.04 + - salt-minion + control: + apt: ~ + pkg: + install: + - cloud-init +aarch64: + base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img + default: + vcpus: 6 + ram: 4096 + virtual: *arch_default_virtual_nodes_infra + cluster: *arch_default_cluster_states + common: + apt: + keys: + - https://linux.enea.com/mcp-repos/queens/xenial/archive-mcpqueens.key + - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub + repos: + # deb [arch=] + - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main + - armband_3 1201 deb [arch=arm64] http://linux.enea.com/mcp-repos/queens/xenial queens-armband main + pkg: + install: + - python-futures + - salt-minion + control: + apt: ~ + pkg: + install: + - cloud-init diff --git a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml new file mode 100644 index 000000000..ce79b838e --- /dev/null +++ b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml @@ -0,0 +1,42 @@ +############################################################################## +# 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-ovs-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 + 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-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 deleted file mode 100644 index 55da8f74b..000000000 --- a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 +++ /dev/null @@ -1,55 +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 %} ---- -cluster: - domain: mcp-ovs-ha.local - states: - - virtual_init -{%- if nm.cluster.has_baremetal_nodes %} - - maas - - baremetal_init -{%- endif %} -{%- if conf.MCP_VCP %} - - virtual_control_plane -{%- endif %} - - openstack_ha - - networks -virtual: - nodes: - infra: -{%- if nm.cluster.has_baremetal_nodes %} - - mas01 -{%- endif %} - control: - - kvm01 - - kvm02 - - kvm03 - compute: - - cmp001 - - cmp002 - # Below values are only used for each node if said node is virtual - 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-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml new file mode 100644 index 000000000..179313bc1 --- /dev/null +++ b/mcp/config/scenario/os-nosdn-nofeature-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-ovs-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-nofeature-noha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2 deleted file mode 100644 index cd214a5cd..000000000 --- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2 +++ /dev/null @@ -1,37 +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 -############################################################################## -{%- import 'net_map.j2' as nm with context %} ---- -cluster: - domain: mcp-ovs-noha.local - states: - - virtual_init -{%- if nm.cluster.has_baremetal_nodes %} - - maas - - baremetal_init -{%- endif %} - - openstack_noha - - neutron_gateway - - networks -virtual: - nodes: - infra: -{%- if nm.cluster.has_baremetal_nodes %} - - mas01 -{%- endif %} - control: - - ctl01 - - gtw01 - compute: - - cmp001 - - cmp002 - ctl01: - vcpus: 4 - ram: 14336 - gtw01: - ram: 2048 diff --git a/mcp/config/scenario/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/os-nosdn-ovs-ha.yaml new file mode 100644 index 000000000..57f2140bb --- /dev/null +++ b/mcp/config/scenario/os-nosdn-ovs-ha.yaml @@ -0,0 +1,43 @@ +############################################################################## +# 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-ovs-dpdk-ha.local + states: + - dpdk + - 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 + 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-ovs-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 deleted file mode 100644 index 0f7a7bc34..000000000 --- a/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 +++ /dev/null @@ -1,56 +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 %} ---- -cluster: - domain: mcp-ovs-dpdk-ha.local - states: - - virtual_init -{%- if nm.cluster.has_baremetal_nodes %} - - maas - - baremetal_init -{%- endif %} -{%- if conf.MCP_VCP %} - - virtual_control_plane -{%- endif %} - - dpdk - - openstack_ha - - networks -virtual: - nodes: - infra: -{%- if nm.cluster.has_baremetal_nodes %} - - mas01 -{%- endif %} - control: - - kvm01 - - kvm02 - - kvm03 - compute: - - cmp001 - - cmp002 - # Below values are only used for each node if said node is virtual - 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-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml new file mode 100644 index 000000000..15cad1d29 --- /dev/null +++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml @@ -0,0 +1,34 @@ +############################################################################## +# 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-ovs-dpdk-noha.local + states: + - dpdk + - openstack_noha + - neutron_gateway + - networks +virtual: + nodes: + control: + - ctl01 + - gtw01 + compute: + - cmp001 + - cmp002 + ctl01: + vcpus: 4 + ram: 14336 + gtw01: + ram: 2048 + cmp001: + vcpus: 4 + ram: 8192 + cmp002: + vcpus: 4 + ram: 8192 diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 b/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 deleted file mode 100644 index bf37f93ea..000000000 --- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 +++ /dev/null @@ -1,44 +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 -############################################################################## -{%- import 'net_map.j2' as nm with context %} ---- -cluster: - domain: mcp-ovs-dpdk-noha.local - states: - - virtual_init -{%- if nm.cluster.has_baremetal_nodes %} - - maas - - baremetal_init -{%- endif %} - - dpdk - - openstack_noha - - neutron_gateway - - networks -virtual: - nodes: - infra: -{%- if nm.cluster.has_baremetal_nodes %} - - mas01 -{%- endif %} - control: - - ctl01 - - gtw01 - compute: - - cmp001 - - cmp002 - ctl01: - vcpus: 4 - ram: 14336 - gtw01: - ram: 2048 - cmp001: - vcpus: 4 - ram: 8192 - cmp002: - vcpus: 4 - ram: 8192 diff --git a/mcp/config/scenario/os-nosdn-vpp-ha.yaml b/mcp/config/scenario/os-nosdn-vpp-ha.yaml new file mode 100644 index 000000000..9e7ebc1e2 --- /dev/null +++ b/mcp/config/scenario/os-nosdn-vpp-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-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-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-vpp-ha.yaml.j2 deleted file mode 100644 index 6ccb59061..000000000 --- a/mcp/config/scenario/os-nosdn-vpp-ha.yaml.j2 +++ /dev/null @@ -1,58 +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 %} ---- -cluster: - domain: mcp-vpp-ha.local - states: -{%- if nm.cluster.has_baremetal_nodes %} - - maas - - baremetal_init -{%- endif %} -{%- if conf.MCP_VCP %} - - virtual_control_plane -{%- endif %} - - openstack_ha - - networks -virtual: - nodes: - infra: - - cfg01 -{%- if nm.cluster.has_baremetal_nodes %} - - mas01 -{%- endif %} - 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 new file mode 100644 index 000000000..e90300407 --- /dev/null +++ b/mcp/config/scenario/os-nosdn-vpp-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-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 diff --git a/mcp/config/scenario/os-nosdn-vpp-noha.yaml.j2 b/mcp/config/scenario/os-nosdn-vpp-noha.yaml.j2 deleted file mode 100644 index 41cb504e1..000000000 --- a/mcp/config/scenario/os-nosdn-vpp-noha.yaml.j2 +++ /dev/null @@ -1,37 +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 -############################################################################## -{%- import 'net_map.j2' as nm with context %} ---- -cluster: - domain: mcp-vpp-noha.local - states: -{%- if nm.cluster.has_baremetal_nodes %} - - maas - - baremetal_init -{%- endif %} - - openstack_noha - - neutron_gateway - - networks -virtual: - nodes: - infra: - - cfg01 -{%- if nm.cluster.has_baremetal_nodes %} - - mas01 -{%- endif %} - control: - - ctl01 - - gtw01 - compute: - - cmp001 - - cmp002 - ctl01: - vcpus: 4 - ram: 14336 - gtw01: - ram: 2048 diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml b/mcp/config/scenario/os-odl-nofeature-ha.yaml new file mode 100644 index 000000000..51d476de5 --- /dev/null +++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml @@ -0,0 +1,43 @@ +############################################################################## +# 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-odl-ha.local + states: + - opendaylight + - 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 + 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-odl-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 deleted file mode 100644 index b31dc136e..000000000 --- a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 +++ /dev/null @@ -1,56 +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 %} ---- -cluster: - domain: mcp-odl-ha.local - states: - - virtual_init -{%- if nm.cluster.has_baremetal_nodes %} - - maas - - baremetal_init -{%- endif %} -{%- if conf.MCP_VCP %} - - virtual_control_plane -{%- endif %} - - opendaylight - - openstack_ha - - networks -virtual: - nodes: - infra: -{%- if nm.cluster.has_baremetal_nodes %} - - mas01 -{%- endif %} - control: - - kvm01 - - kvm02 - - kvm03 - compute: - - cmp001 - - cmp002 - # Below values are only used for each node if said node is virtual - 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-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml new file mode 100644 index 000000000..3133d0e62 --- /dev/null +++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml @@ -0,0 +1,32 @@ +############################################################################## +# 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-odl-noha.local + states: + - opendaylight + - openstack_noha + - neutron_gateway + - networks +virtual: + nodes: + control: + - ctl01 + - gtw01 + - odl01 + compute: + - cmp001 + - cmp002 + ctl01: + vcpus: 4 + ram: 14336 + gtw01: + ram: 2048 + odl01: + vcpus: 4 + ram: 5120 diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 deleted file mode 100644 index 2a10a3163..000000000 --- a/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 +++ /dev/null @@ -1,42 +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 %} ---- -cluster: - domain: mcp-odl-noha.local - states: - - virtual_init -{%- if nm.cluster.has_baremetal_nodes %} - - maas - - baremetal_init -{%- endif %} - - opendaylight - - openstack_noha - - neutron_gateway - - networks -virtual: - nodes: - infra: -{%- if nm.cluster.has_baremetal_nodes %} - - mas01 -{%- endif %} - control: - - ctl01 - - gtw01 - - odl01 - compute: - - cmp001 - - cmp002 - ctl01: - vcpus: 4 - ram: 14336 - gtw01: - ram: 2048 - odl01: - vcpus: 4 - ram: 5120 diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml new file mode 100644 index 000000000..e2df6a476 --- /dev/null +++ b/mcp/config/scenario/os-odl-ovs-noha.yaml @@ -0,0 +1,39 @@ +############################################################################## +# 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-odl-noha.local + states: + - dpdk + - opendaylight + - openstack_noha + - neutron_gateway + - networks +virtual: + nodes: + control: + - ctl01 + - gtw01 + - odl01 + compute: + - cmp001 + - cmp002 + ctl01: + vcpus: 4 + ram: 14336 + gtw01: + ram: 1024 + odl01: + vcpus: 4 + ram: 5120 + cmp001: + vcpus: 4 + ram: 8192 + cmp002: + vcpus: 4 + ram: 8192 diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml.j2 b/mcp/config/scenario/os-odl-ovs-noha.yaml.j2 deleted file mode 100644 index 62c120b26..000000000 --- a/mcp/config/scenario/os-odl-ovs-noha.yaml.j2 +++ /dev/null @@ -1,49 +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 %} ---- -cluster: - domain: mcp-odl-noha.local - states: - - virtual_init -{%- if nm.cluster.has_baremetal_nodes %} - - maas - - baremetal_init -{%- endif %} - - dpdk - - opendaylight - - openstack_noha - - neutron_gateway - - networks -virtual: - nodes: - infra: -{%- if nm.cluster.has_baremetal_nodes %} - - mas01 -{%- endif %} - control: - - ctl01 - - gtw01 - - odl01 - compute: - - cmp001 - - cmp002 - ctl01: - vcpus: 4 - ram: 14336 - gtw01: - ram: 1024 - odl01: - vcpus: 4 - ram: 5120 - cmp001: - vcpus: 4 - ram: 8192 - cmp002: - vcpus: 4 - ram: 8192 diff --git a/mcp/config/scenario/os-ovn-nofeature-ha.yaml b/mcp/config/scenario/os-ovn-nofeature-ha.yaml new file mode 100644 index 000000000..f76b0dce4 --- /dev/null +++ b/mcp/config/scenario/os-ovn-nofeature-ha.yaml @@ -0,0 +1,42 @@ +############################################################################## +# 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-ovn-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 + 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-ovn-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 deleted file mode 100644 index 021548f63..000000000 --- a/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 +++ /dev/null @@ -1,55 +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 %} ---- -cluster: - domain: mcp-ovn-ha.local - states: - - virtual_init -{%- if nm.cluster.has_baremetal_nodes %} - - maas - - baremetal_init -{%- endif %} -{%- if conf.MCP_VCP %} - - virtual_control_plane -{%- endif %} - - openstack_ha - - networks -virtual: - nodes: - infra: -{%- if nm.cluster.has_baremetal_nodes %} - - mas01 -{%- endif %} - control: - - kvm01 - - kvm02 - - kvm03 - compute: - - cmp001 - - cmp002 - # Below values are only used for each node if said node is virtual - 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-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml new file mode 100644 index 000000000..0369f3fe9 --- /dev/null +++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml @@ -0,0 +1,29 @@ +############################################################################## +# 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-ovn-noha.local + states: + - openstack_noha + - networks +virtual: + nodes: + control: + - ctl01 + compute: + - cmp001 + - cmp002 + ctl01: + vcpus: 4 + ram: 14336 + cmp001: + vcpus: 5 + ram: 8192 + cmp002: + vcpus: 5 + ram: 8192 diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 b/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 deleted file mode 100644 index 635106355..000000000 --- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 +++ /dev/null @@ -1,39 +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 -############################################################################## -{%- import 'net_map.j2' as nm with context %} ---- -cluster: - domain: mcp-ovn-noha.local - states: - - virtual_init -{%- if nm.cluster.has_baremetal_nodes %} - - maas - - baremetal_init -{%- endif %} - - openstack_noha - - networks -virtual: - nodes: - infra: -{%- if nm.cluster.has_baremetal_nodes %} - - mas01 -{%- endif %} - control: - - ctl01 - compute: - - cmp001 - - cmp002 - ctl01: - vcpus: 4 - ram: 14336 - cmp001: - vcpus: 5 - ram: 8192 - cmp002: - vcpus: 5 - ram: 8192 diff --git a/mcp/scripts/xdf_data.sh.j2 b/mcp/scripts/xdf_data.sh.j2 index b8c32135c..ee5fffab7 100644 --- a/mcp/scripts/xdf_data.sh.j2 +++ b/mcp/scripts/xdf_data.sh.j2 @@ -14,6 +14,7 @@ {%- import 'net_map.j2' as nm with context -%} {%- set arch = conf[conf.MCP_JUMP_ARCH] -%} {%- set V = conf.virtual -%} +{%- do V.nodes.update(arch.default.virtual.nodes) -%} {%- set section_map = { 'infra': -1, 'control': nm.ctl01.idx, @@ -87,7 +88,7 @@ OPNFV_BRIDGES=( ) export CLUSTER_DOMAIN={{ conf.cluster.domain }} -cluster_states={{ bash_arr(conf.cluster.states) }} +cluster_states={{ bash_arr(arch.default.cluster.states + conf.cluster.states) }} virtual_nodes={{ filter_nodes('virtual') }} control_nodes_query={{ filter_nodes(['baremetal', 'virtual'], True, ['control']) }} base_image={{ arch.base_image }} -- cgit 1.2.3-korg