From f6cae340635775ecd339a08e78ef583ecca092ec Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 <Alexandru.Avadanii@enea.com>
---
 mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 | 55 -------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2

(limited to 'mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2')

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
-- 
cgit 1.2.3-korg