[scenario] Factor out common nodes, states 99/61699/2
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 1 Sep 2018 21:49:08 +0000 (23:49 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 1 Sep 2018 22:49:13 +0000 (00:49 +0200)
commitf6cae340635775ecd339a08e78ef583ecca092ec
tree19db8604b3c61457bc63bfec0df58cf98dc9acd7
parentc4d91eca1ba1614648fb2ae96340ed2876f64cd3
[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>
14 files changed:
mcp/config/scenario/.gitignore
mcp/config/scenario/defaults.yaml.j2 [moved from mcp/config/scenario/defaults.yaml with 78% similarity]
mcp/config/scenario/os-nosdn-nofeature-ha.yaml [moved from mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 with 77% similarity]
mcp/config/scenario/os-nosdn-nofeature-noha.yaml [moved from mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2 with 76% similarity]
mcp/config/scenario/os-nosdn-ovs-ha.yaml [moved from mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 with 77% similarity]
mcp/config/scenario/os-nosdn-ovs-noha.yaml [moved from mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 with 78% similarity]
mcp/config/scenario/os-nosdn-vpp-ha.yaml [moved from mcp/config/scenario/os-nosdn-vpp-ha.yaml.j2 with 78% similarity]
mcp/config/scenario/os-nosdn-vpp-noha.yaml [moved from mcp/config/scenario/os-nosdn-vpp-noha.yaml.j2 with 76% similarity]
mcp/config/scenario/os-odl-nofeature-ha.yaml [moved from mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 with 77% similarity]
mcp/config/scenario/os-odl-nofeature-noha.yaml [moved from mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 with 77% similarity]
mcp/config/scenario/os-odl-ovs-noha.yaml [moved from mcp/config/scenario/os-odl-ovs-noha.yaml.j2 with 79% similarity]
mcp/config/scenario/os-ovn-nofeature-ha.yaml [moved from mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 with 77% similarity]
mcp/config/scenario/os-ovn-nofeature-noha.yaml [moved from mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 with 76% similarity]
mcp/scripts/xdf_data.sh.j2