[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>

5 files changed, 0 insertions, 153 deletions

diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
deleted file mode 100644
index b35e66fc7..000000000
--- a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
+++ /dev/null
@@ -1,27 +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: virtual-mcp-pike-ovs-noha.local
-  states:
-    - openstack_noha
-    - neutron_gateway
-    - neutron_compute
-    - networks
-virtual:
-  nodes:
-    - cfg01
-    - ctl01
-    - cmp01
-    - cmp02
-    - gtw01
-  ctl01:
-    vcpus: 4
-    ram: 14336
-  gtw01:
-    ram: 2048
diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml
deleted file mode 100644
index 69d407b82..000000000
--- a/mcp/config/scenario/virtual/os-nosdn-nofeature-novcp-ha.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-##############################################################################
-# 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
-##############################################################################
----
-cluster:
-  domain: mcp-pike-ovs-novcp-ha.local
-  states:
-    - openstack_ha
-    - networks
-virtual:
-  nodes:
-    - cfg01
-    - kvm01
-    - kvm02
-    - kvm03
-    - cmp001
-    - cmp002
-  # NOTE: We might need to add more RAM here
-  kvm01:
-    vcpus: 4
-    ram: 14336
-  kvm02:
-    vcpus: 4
-    ram: 14336
-  kvm03:
-    vcpus: 4
-    ram: 14336
diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
deleted file mode 100644
index e3cd3dbd9..000000000
--- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
+++ /dev/null
@@ -1,34 +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: virtual-mcp-pike-ovs-dpdk-noha.local
-  states:
-    - dpdk
-    - openstack_noha
-    - neutron_gateway
-    - neutron_compute
-    - networks
-virtual:
-  nodes:
-    - cfg01
-    - ctl01
-    - cmp01
-    - cmp02
-    - gtw01
-  ctl01:
-    vcpus: 4
-    ram: 14336
-  gtw01:
-    ram: 2048
-  cmp01:
-    vcpus: 4
-    ram: 8192
-  cmp02:
-    vcpus: 4
-    ram: 8192
diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
deleted file mode 100644
index cef41270c..000000000
--- a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
+++ /dev/null
@@ -1,31 +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: virtual-mcp-pike-odl-noha.local
-  states:
-    - opendaylight
-    - openstack_noha
-    - neutron_gateway
-    - networks
-virtual:
-  nodes:
-    - cfg01
-    - ctl01
-    - cmp01
-    - cmp02
-    - gtw01
-    - odl01
-  ctl01:
-    vcpus: 4
-    ram: 14336
-  gtw01:
-    ram: 2048
-  odl01:
-    vcpus: 4
-    ram: 5120
diff --git a/mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml
deleted file mode 100644
index e0a19ebb2..000000000
--- a/mcp/config/scenario/virtual/os-ovn-nofeature-noha.yaml
+++ /dev/null
@@ -1,30 +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: virtual-mcp-pike-ovn-noha.local
-  states:
-    - openstack_noha
-    - ovn_ctl_opts
-    - neutron_compute
-    - networks
-virtual:
-  nodes:
-    - cfg01
-    - ctl01
-    - cmp01
-    - cmp02
-  ctl01:
-    vcpus: 4
-    ram: 14336
-  cmp01:
-    vcpus: 5
-    ram: 8192
-  cmp02:
-    vcpus: 5
-    ram: 8192