summaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/config')
-rw-r--r--mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j225
-rw-r--r--mcp/config/scenario/os-nosdn-nofeature-noha.yaml13
-rw-r--r--mcp/config/scenario/os-nosdn-ovs-ha.yaml.j225
-rw-r--r--mcp/config/scenario/os-nosdn-ovs-noha.yaml13
-rw-r--r--mcp/config/scenario/os-odl-nofeature-ha.yaml.j225
-rw-r--r--mcp/config/scenario/os-odl-nofeature-noha.yaml15
-rw-r--r--mcp/config/scenario/os-odl-ovs-noha.yaml15
-rw-r--r--mcp/config/scenario/os-ovn-nofeature-ha.yaml.j225
-rw-r--r--mcp/config/scenario/os-ovn-nofeature-noha.yaml11
9 files changed, 85 insertions, 82 deletions
diff --git a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
index 26938262e..7eb604e65 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
@@ -21,25 +21,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
diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
index 5c5e77ceb..8a3a33db0 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml
@@ -14,11 +14,14 @@ cluster:
- networks
virtual:
nodes:
- - cfg01
- - ctl01
- - cmp001
- - cmp002
- - gtw01
+ infra:
+ - cfg01
+ control:
+ - ctl01
+ - gtw01
+ compute:
+ - cmp001
+ - cmp002
ctl01:
vcpus: 4
ram: 14336
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
diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
index 19e7946d1..795b73064 100644
--- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
@@ -15,11 +15,14 @@ cluster:
- networks
virtual:
nodes:
- - cfg01
- - ctl01
- - cmp001
- - cmp002
- - gtw01
+ infra:
+ - cfg01
+ control:
+ - ctl01
+ - gtw01
+ compute:
+ - cmp001
+ - cmp002
ctl01:
vcpus: 4
ram: 14336
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
diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml
index ec04ee87a..d0a490ef9 100644
--- a/mcp/config/scenario/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml
@@ -15,12 +15,15 @@ cluster:
- networks
virtual:
nodes:
- - cfg01
- - ctl01
- - cmp001
- - cmp002
- - gtw01
- - odl01
+ infra:
+ - cfg01
+ control:
+ - ctl01
+ - gtw01
+ - odl01
+ compute:
+ - cmp001
+ - cmp002
ctl01:
vcpus: 4
ram: 14336
diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml
index 083e7e646..29e6842ac 100644
--- a/mcp/config/scenario/os-odl-ovs-noha.yaml
+++ b/mcp/config/scenario/os-odl-ovs-noha.yaml
@@ -16,12 +16,15 @@ cluster:
- networks
virtual:
nodes:
- - cfg01
- - ctl01
- - cmp001
- - cmp002
- - gtw01
- - odl01
+ infra:
+ - cfg01
+ control:
+ - ctl01
+ - gtw01
+ - odl01
+ compute:
+ - cmp001
+ - cmp002
ctl01:
vcpus: 4
ram: 14336
diff --git a/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2
index 218b5dece..f81779b8a 100644
--- a/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2
+++ b/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2
@@ -21,25 +21,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
diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
index 7036340bf..fc4086670 100644
--- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml
+++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml
@@ -13,10 +13,13 @@ cluster:
- networks
virtual:
nodes:
- - cfg01
- - ctl01
- - cmp001
- - cmp002
+ infra:
+ - cfg01
+ control:
+ - ctl01
+ compute:
+ - cmp001
+ - cmp002
ctl01:
vcpus: 4
ram: 14336