[hybrid] Merge config/scenario/{baremetal,virtual} 43/51643/5
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 4 Feb 2018 20:16:07 +0000 (21:16 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 6 Feb 2018 22:40:59 +0000 (23:40 +0100)
commit86c8109641cf22548ca68876e7de89b0d13e96b5
treeb3b2ffc36b9de3e93d4638110e9586adc6f458df
parent1a0e8e7e86aa5884a678ba448c6eb09c00ecc032
[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>
14 files changed:
ci/deploy.sh
mcp/config/scenario/.gitignore [new file with mode: 0644]
mcp/config/scenario/README.rst
mcp/config/scenario/baremetal/os-nosdn-nofeature-novcp-ha.yaml [deleted file]
mcp/config/scenario/os-nosdn-nofeature-ha.yaml [moved from mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml with 100% similarity]
mcp/config/scenario/os-nosdn-nofeature-noha.yaml [moved from mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml with 100% similarity]
mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 [moved from mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml with 50% similarity]
mcp/config/scenario/os-nosdn-ovs-ha.yaml [moved from mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml with 100% similarity]
mcp/config/scenario/os-nosdn-ovs-noha.yaml [moved from mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml with 100% similarity]
mcp/config/scenario/os-odl-nofeature-ha.yaml [moved from mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml with 100% similarity]
mcp/config/scenario/os-odl-nofeature-noha.yaml [moved from mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml with 100% similarity]
mcp/config/scenario/os-ovn-nofeature-noha.yaml [moved from mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml with 100% similarity]
mcp/scripts/requirements_deb.yaml
mcp/scripts/requirements_rpm.yaml