diff options
author | 2018-02-07 14:53:05 +0000 | |
---|---|---|
committer | 2018-02-07 14:53:05 +0000 | |
commit | 0f1bef52ce8e7040934ec16894b266579bb82c58 (patch) | |
tree | 9dc59459d3d63bd41cb354e014a000f0b5f4d54a /mcp/config/scenario | |
parent | e8b0ec175eb68c792c7da3d225214c8b1874f42d (diff) | |
parent | 86c8109641cf22548ca68876e7de89b0d13e96b5 (diff) |
Merge "[hybrid] Merge config/scenario/{baremetal,virtual}"
Diffstat (limited to 'mcp/config/scenario')
-rw-r--r-- | mcp/config/scenario/.gitignore | 1 | ||||
-rw-r--r-- | mcp/config/scenario/README.rst | 2 | ||||
-rw-r--r-- | mcp/config/scenario/baremetal/os-nosdn-nofeature-novcp-ha.yaml | 25 | ||||
-rw-r--r-- | mcp/config/scenario/os-nosdn-nofeature-ha.yaml (renamed from mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml) | 0 | ||||
-rw-r--r-- | mcp/config/scenario/os-nosdn-nofeature-noha.yaml (renamed from mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml) | 0 | ||||
-rw-r--r-- | mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 (renamed from mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml) | 26 | ||||
-rw-r--r-- | mcp/config/scenario/os-nosdn-ovs-ha.yaml (renamed from mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml) | 0 | ||||
-rw-r--r-- | mcp/config/scenario/os-nosdn-ovs-noha.yaml (renamed from mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml) | 0 | ||||
-rw-r--r-- | mcp/config/scenario/os-odl-nofeature-ha.yaml (renamed from mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml) | 0 | ||||
-rw-r--r-- | mcp/config/scenario/os-odl-nofeature-noha.yaml (renamed from mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml) | 0 | ||||
-rw-r--r-- | mcp/config/scenario/os-ovn-nofeature-noha.yaml (renamed from mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml) | 0 |
11 files changed, 28 insertions, 26 deletions
diff --git a/mcp/config/scenario/.gitignore b/mcp/config/scenario/.gitignore new file mode 100644 index 000000000..14e9ab880 --- /dev/null +++ b/mcp/config/scenario/.gitignore @@ -0,0 +1 @@ +os-nosdn-nofeature-novcp-ha.yaml diff --git a/mcp/config/scenario/README.rst b/mcp/config/scenario/README.rst index 389877ac4..e03182f11 100644 --- a/mcp/config/scenario/README.rst +++ b/mcp/config/scenario/README.rst @@ -19,4 +19,4 @@ feature scenarios used by Fuel@OPNFV, e.g.: NOTES: ------ This directory is highly likely to change and/or be replaced/complemented -by the new PDF (Pod Descriptor File) info in securedlab OPNFV git repo. +by the new PDF (Pod Descriptor File) info in Pharos OPNFV git repo. diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-novcp-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-novcp-ha.yaml deleted file mode 100644 index 0c5744199..000000000 --- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-novcp-ha.yaml +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################## -# Copyright (c) 2017 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 -############################################################################## ---- -cluster: - domain: mcp-pike-ovs-novcp-ha.local - states: - - maas - - baremetal_init - - openstack_ha - - networks -virtual: - nodes: - - cfg01 - - mas01 - cfg01: - vcpus: 4 - ram: 6144 - mas01: - vcpus: 4 - ram: 6144 diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml index 547bc2972..547bc2972 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml index b35e66fc7..b35e66fc7 100644 --- a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 index 69d407b82..58f418622 100644 --- a/mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 @@ -5,20 +5,46 @@ # 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 diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/os-nosdn-ovs-ha.yaml index a7ecba7fc..a7ecba7fc 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml +++ b/mcp/config/scenario/os-nosdn-ovs-ha.yaml diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml index e3cd3dbd9..e3cd3dbd9 100644 --- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/os-odl-nofeature-ha.yaml index 7cf1033a4..7cf1033a4 100644 --- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml +++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml index cef41270c..cef41270c 100644 --- a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml diff --git a/mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml index e0a19ebb2..e0a19ebb2 100644 --- a/mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml |