diff options
Diffstat (limited to 'config/installers/daisy/network.yaml.j2')
| -rw-r--r-- | config/installers/daisy/network.yaml.j2 | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/config/installers/daisy/network.yaml.j2 b/config/installers/daisy/network.yaml.j2 index 914df461..b9f586dc 100644 --- a/config/installers/daisy/network.yaml.j2 +++ b/config/installers/daisy/network.yaml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 ZTE Corporation and others. +# Copyright (c) 2018 ZTE Corporation and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 @@ -44,7 +44,7 @@ networks: {%- set nodes_num = conf['nodes'] | length -%} {%- set networks = {} -%} {%- for key in mapping -%} - {%- set net_data = conf['net_config'][mapping[key]] -%} + {%- set net_data = conf.idf.net_config[mapping[key]] -%} {%- set interface = net_data['interface'] -%} {%- set interface_name = conf.idf[installer].network.node[0].interfaces[interface] -%} {%- set bus_addr = conf.idf[installer].network.node[0].busaddr[interface] -%} @@ -72,17 +72,17 @@ networks: {%- set gateway = ".".join([ips[0], ips[1], ips[2], "1"]) -%} {%- endif -%} - {%- set networks = 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 }}' |