[scenario] Factor out common nodes, states

[fuel.git] / mcp / config / scenario / os-nosdn-vpp-ha.yaml

diff --git a/mcp/config/scenario/os-nosdn-vpp-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-vpp-ha.yaml
similarity index 78%
rename from mcp/config/scenario/os-nosdn-vpp-ha.yaml.j2
rename to mcp/config/scenario/os-nosdn-vpp-ha.yaml
index 6ccb590..9e7ebc1 100644 (file)
--- a/mcp/config/scenario/os-nosdn-vpp-ha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-vpp-ha.yaml
@@ -5,27 +5,14 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-{%- import 'net_map.j2' as nm with context %}
 ---
 cluster:
   domain: mcp-vpp-ha.local
   states:
-{%- if nm.cluster.has_baremetal_nodes %}
-    - maas
-    - baremetal_init
-{%- endif %}
-{%- if conf.MCP_VCP %}
-    - virtual_control_plane
-{%- endif %}
     - openstack_ha
     - networks
 virtual:
   nodes:
-    infra:
-      - cfg01
-{%- if nm.cluster.has_baremetal_nodes %}
-      - mas01
-{%- endif %}
     control:
       - kvm01
       - kvm02