summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjenkins <jenkins@cmp001.mcp-ovs-ha.local>2019-02-11 11:04:36 +0000
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-02-11 16:34:03 +0100
commitd387c6a0b3fc3637b230edc987c45bce2e0ff3a3 (patch)
tree309739723daf94b271662d1992e9904fe7a50f80
parent917a71636a73cc72098d13ec32e52520cced8237 (diff)
[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>
-rw-r--r--config/installers/fuel/net_map.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/config/installers/fuel/net_map.j2 b/config/installers/fuel/net_map.j2
index 8a0e58d..bc1ac78 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("/") %}