From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 5 Mar 2018 17:50:07 +0000 (+0000)
Subject: Merge "config/installers: Adopt j2 'do' extension"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0946b039ae44d40a69e40db2ec4603c59aca006a;hp=148a9edf9839cd8aa3d1295cb79f408819ad4cd1;p=pharos.git

Merge "config/installers: Adopt j2 'do' extension"
---

diff --git a/config/installers/daisy/network.yaml.j2 b/config/installers/daisy/network.yaml.j2
index f976ab73..b9f586dc 100644
--- a/config/installers/daisy/network.yaml.j2
+++ b/config/installers/daisy/network.yaml.j2
@@ -72,18 +72,17 @@ networks:
       {%- set gateway = ".".join([ips[0], ips[1], ips[2], "1"]) -%}
     {%- endif -%}
 
-    {#- set v=v.update(...) is unpredictable and breaks in older j2 -#}
-    {%- set _ = networks.update({key: {'interface_name': interface_name,
-                                              'bus_addr': bus_addr,
-                                              'vlan': vlan,
-                                              'network': network,
-                                              'mask': mask,
-                                              'start': start,
-                                              'end': end,
-                                              'vip': vip,
-                                              'gateway': gateway
-                                             }
-                                       }) %}
+    {%- do networks.update({key: {'interface_name': interface_name,
+                                  'bus_addr': bus_addr,
+                                  'vlan': vlan,
+                                  'network': network,
+                                  'mask': mask,
+                                  'start': start,
+                                  'end': end,
+                                  'vip': vip,
+                                  'gateway': gateway
+                                 }
+                           }) %}
 
   - cidr: '{{ network }}/{{ mask }}'
     gateway: '{{ gateway }}'
diff --git a/config/installers/fuel/net_map.j2 b/config/installers/fuel/net_map.j2
index c3ff6cb7..880df20f 100644
--- a/config/installers/fuel/net_map.j2
+++ b/config/installers/fuel/net_map.j2
@@ -36,7 +36,7 @@
 {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) #}
 {%- for role in [ctl01, cmp001] %}
     {%- set node = conf.idf.fuel.network.node[role.idx] %}
-    {%- set _ = role.update({
+    {%- do role.update({
         'nic_mcp': node.interfaces[idx_mcp],
         'nic_admin': node.interfaces[idx_admin],
         'nic_mgmt': node.interfaces[idx_mgmt],