diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-05 17:50:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-05 17:50:07 +0000 |
| commit | 0946b039ae44d40a69e40db2ec4603c59aca006a (patch) | |
| tree | 3896d7ad45b9ac7c282e0ebe08ad2f95b4cb35a3 | |
| parent | 148a9edf9839cd8aa3d1295cb79f408819ad4cd1 (diff) | |
| parent | 069a9cf4e79b1376ada39764f310dbb37c01d7e7 (diff) | |
Merge "config/installers: Adopt j2 'do' extension"
| -rw-r--r-- | config/installers/daisy/network.yaml.j2 | 23 | ||||
| -rw-r--r-- | config/installers/fuel/net_map.j2 | 2 |
2 files changed, 12 insertions, 13 deletions
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], |