diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-05 19:36:01 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-07 06:21:10 +0200 |
| commit | bef972ea691f73527a845cd8a8b89f1958eb9cb2 (patch) | |
| tree | e4ac299bba10a54d0b21db9db9fb62eadac118a9 /mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 | |
| parent | 291d972bdd666d36e35f8bb3953b0da806ea0eea (diff) | |
[scenarios] Differentiate virtual node roles
Split scenario yaml definitions for virtual.nodes based on node
role ('infra', 'control' or 'compute'), to be leveraged later to
contruct node lists based on said role.
This moves the responsability of filtering node names in scenario
files (based on 'virtual' or 'baremetal' type) to xdf_data.sh.j2,
simplifying scenario templates.
By keeping all nodes (both virtual and baremetal) in scenario files,
we can later determine the role (and implicitly the hostname) for a
MaaS-managed node based on its index in the virtual.nodes.control
structure.
JIRA: FUEL-382
Change-Id: I1f83a307631f4166ee1c57ef598c44876b962f97
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2')
| -rw-r--r-- | mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 index f9ab7c3fb..da9938ce0 100644 --- a/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 +++ b/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 @@ -22,25 +22,22 @@ cluster: - networks virtual: nodes: - - cfg01 + infra: + - cfg01 {%- if nm.cluster.has_baremetal_nodes %} - - mas01 -{%- endif %} -{#- Most likely, controllers will always have the same type and number (3) #} -{%- if conf.nodes[nm.ctl01.idx].node.type == 'virtual' %} - - kvm01 - - kvm02 - - kvm03 -{%- endif %} -{#- Later, we might have mixed computes here, for hybrid multi-arch testing #} -{%- if conf.nodes[nm.cmp001.idx].node.type == 'virtual' %} - - cmp001 - - cmp002 + - 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 - # Below values are only used when nodes are defined in virtual.nodes above mas01: vcpus: 4 ram: 6144 |