diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-08-08 11:03:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-08 11:03:17 +0000 |
| commit | 6a3bbf95c70207a146c5b2c82d8518cf02e5c269 (patch) | |
| tree | 46bff9b92df4a20aae1e2d38b2e6d8defae9e9cb /mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 | |
| parent | 143bf770cf104daaf8d457a3de294d6acb33f9cf (diff) | |
| parent | a5c7084e2c7711ebfafec56a39afab91d236585f (diff) | |
Merge changes from topic 'baremetal-noha'
* changes:
[states] baremetal_init: Parameterize kvm hosts
[scenarios] Differentiate virtual node roles
Diffstat (limited to 'mcp/config/scenario/os-odl-nofeature-ha.yaml.j2')
| -rw-r--r-- | mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 index c48f18c51..fbedbc6b9 100644 --- a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 +++ b/mcp/config/scenario/os-odl-nofeature-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 |