diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2018-01-15 21:45:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-15 21:45:00 +0000 |
| commit | 5a013a2f7b2b64b91d2f61ec1a1f1378a5d62977 (patch) | |
| tree | 01390b984fbd6d840971b2645c3abd1544573a0c /config | |
| parent | 277aab79e2efa7acc1accd7469d10bb1029882c2 (diff) | |
| parent | 1e35f14466291b34ec10e8c63e070d9d50681593 (diff) | |
Merge changes from topic 'move-net_config-idf'
* changes:
[PDF] Daisy, Fuel: Drop support for PDF net_config
[PDF] zte-pod*: Move net_config to IDF
[PDF] lf-pod*: Drop 'fixed_ips'
[PDD] ericsson-pod*: Move net_config to IDF
[PDF] bii-pod*: Move net_config to IDF
[PDF] arm-pod*: Move net_config to IDF
[PDF] Daisy, Fuel: Add support for IDF net_config
Diffstat (limited to 'config')
| -rw-r--r-- | config/installers/daisy/network.yaml.j2 | 2 | ||||
| -rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/config/installers/daisy/network.yaml.j2 b/config/installers/daisy/network.yaml.j2 index 914df461..f5ac6150 100644 --- a/config/installers/daisy/network.yaml.j2 +++ b/config/installers/daisy/network.yaml.j2 @@ -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] -%} diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index bfcec091..8a4d869e 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -1,18 +1,18 @@ --- {%- if conf.idf is defined and conf.idf.fuel is defined -%} - {%- if conf.net_config is defined -%} - {%- set net_admin = conf.net_config.admin.network -%} - {%- set net_mgmt = conf.net_config.mgmt.network -%} - {%- set net_private = conf.net_config.private.network -%} - {%- set net_public = conf.net_config.public.network -%} - {%- set vlan_mgmt = conf.net_config.mgmt.vlan -%} - {%- set vlan_private = conf.net_config.private.vlan -%} - {%- if conf.net_config.public.dns is defined -%} - {%- set dns_public = conf.net_config.public.dns -%} + {%- if conf.idf.net_config is defined -%} + {%- set net_admin = conf.idf.net_config.admin.network -%} + {%- set net_mgmt = conf.idf.net_config.mgmt.network -%} + {%- set net_private = conf.idf.net_config.private.network -%} + {%- set net_public = conf.idf.net_config.public.network -%} + {%- set vlan_mgmt = conf.idf.net_config.mgmt.vlan -%} + {%- set vlan_private = conf.idf.net_config.private.vlan -%} + {%- if conf.idf.net_config.public.dns is defined -%} + {%- set dns_public = conf.idf.net_config.public.dns -%} {%- endif -%} - {%- set pxe_interface = conf.net_config.admin.interface -%} - {%- if conf.net_config.public.gateway is defined -%} - {%- set net_public_gw = conf.net_config.public.gateway -%} + {%- set pxe_interface = conf.idf.net_config.admin.interface -%} + {%- if conf.idf.net_config.public.gateway is defined -%} + {%- set net_public_gw = conf.idf.net_config.public.gateway -%} {%- endif -%} {%- else -%} {%- set net_admin = '192.168.11.0' -%} |