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 --- .../scenario/os-nosdn-nofeature-noha.yaml.j2 | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100644 mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2 (limited to 'mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2') 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 -- cgit 1.2.3-korg