From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 1 Aug 2018 21:45:16 +0000 (+0200)
Subject: [maas] Allow more than two compute nodes
X-Git-Tag: opnfv-7.0.0~126
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F60511%2F1;p=fuel.git

[maas] Allow more than two compute nodes

Change-Id: Ie023bfe7b322a49a8b525e7926518c94899c67ce
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2
index ae59316bd..b2d7cefad 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2
@@ -108,11 +108,13 @@ parameters:
 {%- endif %}
       machines:
       {%- set pxe_interface = conf.idf.net_config.admin.interface %}
-      {#- We only support exactly 5 nodes for now, hardcoded order #}
-      {%- set node_roles = ['kvm01', 'kvm02', 'kvm03', 'cmp001', 'cmp002'] %}
       {%- for node in conf.nodes %}
       {%- if node.node.type == 'baremetal' %}
-        {{ node_roles[loop.index0] }}:
+        {%- if loop.index > nm.cmp001.idx %}
+        cmp{{ '%03d' | format(loop.index - nm.cmp001.idx) }}:
+        {%- else %}
+        kvm{{ '%02d' | format(loop.index) }}:
+        {%- endif %}
           interface:
             mac: {{ node.interfaces[pxe_interface].mac_address }}
           power_parameters:
@@ -123,7 +125,7 @@ parameters:
           architecture: {{ node.node.arch | dpkg_arch }}/generic
           distro_series: xenial
           hwe_kernel: ${_param:hwe_kernel}
-          {%- if loop.index0 >= node_roles.index('cmp001')  %}
+          {%- if loop.index > nm.cmp001.idx %}
           disk_layout:
             type: lvm
             root_device: sda