diff options
author | 2018-02-04 21:16:07 +0100 | |
---|---|---|
committer | 2018-02-06 23:40:59 +0100 | |
commit | 86c8109641cf22548ca68876e7de89b0d13e96b5 (patch) | |
tree | b3b2ffc36b9de3e93d4638110e9586adc6f458df /mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 | |
parent | 1a0e8e7e86aa5884a678ba448c6eb09c00ecc032 (diff) |
[hybrid] Merge config/scenario/{baremetal,virtual}
Instead of classifying scenarios by underlying machine type, switch
to HA/NOHA differentiantion only.
This allows us to add support for hybrid scenarios (with some virtual
and some baremetal nodes in the same cluster).
To facilitate this, we will template the scenario files, which is a
small step towards SDF (Scenario Descriptor File) definition and
adoption later.
JIRA: FUEL-338
Change-Id: If5787991869a3105d82c27ffa0a86ac79b4b08ba
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2')
-rw-r--r-- | mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 new file mode 100644 index 000000000..58f418622 --- /dev/null +++ b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 @@ -0,0 +1,57 @@ +############################################################################## +# 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 %} +{%- for node in conf.nodes %} + {%- if node.node.type == 'baremetal' %} + {%- set cluster_has_baremetal_nodes = True %} + {%- endif %} +{%- endfor %} +--- +cluster: + domain: mcp-pike-ovs-novcp-ha.local + states: +{%- if cluster_has_baremetal_nodes %} + - maas + - baremetal_init +{%- endif %} + - openstack_ha + - networks +virtual: + nodes: + - cfg01 +{%- if 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 +{%- endif %} + cfg01: + vcpus: 4 + ram: 6144 + # Below values are only used when nodes are defined in virtual.nodes above + 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 |