1 files changed, 4 insertions, 2 deletions

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
index d980c29d4..4e9323b68 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
@@ -108,12 +108,14 @@ parameters:
 {%- endif %}
       machines:
       {%- set pxe_interface = conf.idf.net_config.admin.interface %}
+      {%- set ctl_roles = conf.virtual.nodes.control | length %}
       {%- for node in conf.nodes %}
-      {%- if node.node.type == 'baremetal' %}
+      {%- if (node.node.type == 'baremetal' and (
+              loop.index > nm.cmp001.idx or loop.index0 < ctl_roles)) %}
         {%- if loop.index > nm.cmp001.idx %}
         cmp{{ '%03d' | format(loop.index - nm.cmp001.idx) }}:
         {%- else %}
-        kvm{{ '%02d' | format(loop.index) }}:
+        {{ conf.virtual.nodes.control[loop.index0] }}:
         {%- endif %}
           interface:
             mac: {{ node.interfaces[pxe_interface].mac_address }}