From: jenkins <jenkins@cmp001.mcp-ovs-ha.local>
Date: Mon, 11 Feb 2019 11:04:36 +0000 (+0000)
Subject: [fuel] Allow PODs with fewer nodes
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F66937%2F1;p=pharos.git

[fuel] Allow PODs with fewer nodes

Our hardcoded index for the compute role interferes with PODs
having less than the hardcoded expected node count.

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

diff --git a/config/installers/fuel/net_map.j2 b/config/installers/fuel/net_map.j2
index 8a0e58d1..bc1ac789 100644
--- a/config/installers/fuel/net_map.j2
+++ b/config/installers/fuel/net_map.j2
@@ -36,6 +36,7 @@
 
 {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) #}
 {%- for role in [ctl01, cmp001] %}
+    {%- if role.idx < conf.nodes | length %}
     {%- set node = conf.idf.fuel.network.node[role.idx] %}
     {%- do role.update({
         'nic_mcp': node.interfaces[idx_mcp],
@@ -45,6 +46,7 @@
         'nic_public': node.interfaces[idx_public],
         'bus_private': node.busaddr[idx_private]}) %}
     {#- PCI addresses are only used on computes for DPDK on private net #}
+    {%- endif %}
 {%- endfor %}
 
 {%- set net_admin = [net.admin.network, net.admin.mask] | join("/") %}