9 files changed, 9 insertions, 21 deletions
diff --git a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
index 7eb604e65..55da8f74b 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
@@ -10,6 +10,7 @@
 cluster:
   domain: mcp-ovs-ha.local
   states:
+    - virtual_init
 {%- if nm.cluster.has_baremetal_nodes %}
     - maas
     - baremetal_init
@@ -22,7 +23,6 @@ cluster:
 virtual:
   nodes:
     infra:
-      - cfg01
 {%- if nm.cluster.has_baremetal_nodes %}
       - mas01
 {%- endif %}
@@ -34,9 +34,6 @@ virtual:
       - cmp001
       - cmp002
   # Below values are only used for each node if said node is virtual
-  cfg01:
-    vcpus: 4
-    ram: 6144
   mas01:
     vcpus: 4
     ram: 6144
diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2
index a0ad96b87..cd214a5cd 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml.j2
@@ -10,6 +10,7 @@
 cluster:
   domain: mcp-ovs-noha.local
   states:
+    - virtual_init
 {%- if nm.cluster.has_baremetal_nodes %}
     - maas
     - baremetal_init
@@ -20,7 +21,6 @@ cluster:
 virtual:
   nodes:
     infra:
-      - cfg01
 {%- if nm.cluster.has_baremetal_nodes %}
       - mas01
 {%- endif %}
diff --git a/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2
index da9938ce0..0f7a7bc34 100644
--- a/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2
@@ -10,6 +10,7 @@
 cluster:
   domain: mcp-ovs-dpdk-ha.local
   states:
+    - virtual_init
 {%- if nm.cluster.has_baremetal_nodes %}
     - maas
     - baremetal_init
@@ -23,7 +24,6 @@ cluster:
 virtual:
   nodes:
     infra:
-      - cfg01
 {%- if nm.cluster.has_baremetal_nodes %}
       - mas01
 {%- endif %}
@@ -35,9 +35,6 @@ virtual:
       - cmp001
       - cmp002
   # Below values are only used for each node if said node is virtual
-  cfg01:
-    vcpus: 4
-    ram: 6144
   mas01:
     vcpus: 4
     ram: 6144
diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2 b/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2
index bee0e926f..bf37f93ea 100644
--- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml.j2
@@ -10,6 +10,7 @@
 cluster:
   domain: mcp-ovs-dpdk-noha.local
   states:
+    - virtual_init
 {%- if nm.cluster.has_baremetal_nodes %}
     - maas
     - baremetal_init
@@ -21,7 +22,6 @@ cluster:
 virtual:
   nodes:
     infra:
-      - cfg01
 {%- if nm.cluster.has_baremetal_nodes %}
       - mas01
 {%- endif %}
diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2
index fbedbc6b9..b31dc136e 100644
--- a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2
+++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2
@@ -10,6 +10,7 @@
 cluster:
   domain: mcp-odl-ha.local
   states:
+    - virtual_init
 {%- if nm.cluster.has_baremetal_nodes %}
     - maas
     - baremetal_init
@@ -23,7 +24,6 @@ cluster:
 virtual:
   nodes:
     infra:
-      - cfg01
 {%- if nm.cluster.has_baremetal_nodes %}
       - mas01
 {%- endif %}
@@ -35,9 +35,6 @@ virtual:
       - cmp001
       - cmp002
   # Below values are only used for each node if said node is virtual
-  cfg01:
-    vcpus: 4
-    ram: 6144
   mas01:
     vcpus: 4
     ram: 6144
diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2
index 7df28c2b3..2a10a3163 100644
--- a/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2
+++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml.j2
@@ -10,6 +10,7 @@
 cluster:
   domain: mcp-odl-noha.local
   states:
+    - virtual_init
 {%- if nm.cluster.has_baremetal_nodes %}
     - maas
     - baremetal_init
@@ -21,7 +22,6 @@ cluster:
 virtual:
   nodes:
     infra:
-      - cfg01
 {%- if nm.cluster.has_baremetal_nodes %}
       - mas01
 {%- endif %}
diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml.j2 b/mcp/config/scenario/os-odl-ovs-noha.yaml.j2
index c81d35c51..62c120b26 100644
--- a/mcp/config/scenario/os-odl-ovs-noha.yaml.j2
+++ b/mcp/config/scenario/os-odl-ovs-noha.yaml.j2
@@ -10,6 +10,7 @@
 cluster:
   domain: mcp-odl-noha.local
   states:
+    - virtual_init
 {%- if nm.cluster.has_baremetal_nodes %}
     - maas
     - baremetal_init
@@ -22,7 +23,6 @@ cluster:
 virtual:
   nodes:
     infra:
-      - cfg01
 {%- if nm.cluster.has_baremetal_nodes %}
       - mas01
 {%- endif %}
diff --git a/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2
index f81779b8a..021548f63 100644
--- a/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2
+++ b/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2
@@ -10,6 +10,7 @@
 cluster:
   domain: mcp-ovn-ha.local
   states:
+    - virtual_init
 {%- if nm.cluster.has_baremetal_nodes %}
     - maas
     - baremetal_init
@@ -22,7 +23,6 @@ cluster:
 virtual:
   nodes:
     infra:
-      - cfg01
 {%- if nm.cluster.has_baremetal_nodes %}
       - mas01
 {%- endif %}
@@ -34,9 +34,6 @@ virtual:
       - cmp001
       - cmp002
   # Below values are only used for each node if said node is virtual
-  cfg01:
-    vcpus: 4
-    ram: 6144
   mas01:
     vcpus: 4
     ram: 6144
diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2 b/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2
index fee47d7eb..635106355 100644
--- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2
+++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml.j2
@@ -10,6 +10,7 @@
 cluster:
   domain: mcp-ovn-noha.local
   states:
+    - virtual_init
 {%- if nm.cluster.has_baremetal_nodes %}
     - maas
     - baremetal_init
@@ -19,7 +20,6 @@ cluster:
 virtual:
   nodes:
     infra:
-      - cfg01
 {%- if nm.cluster.has_baremetal_nodes %}
       - mas01
 {%- endif %}