From 1e35f14466291b34ec10e8c63e070d9d50681593 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 14 Jan 2018 20:04:09 +0100 Subject: [PDF] Daisy, Fuel: Drop support for PDF net_config Change-Id: I889db9a4663f1b2740207e6c25dc8d09645a3708 Signed-off-by: Alexandru Avadanii --- config/installers/fuel/pod_config.yml.j2 | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'config/installers/fuel') diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 22d6193d..8a4d869e 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -1,23 +1,18 @@ --- {%- if conf.idf is defined and conf.idf.fuel is defined -%} - {%- if conf.net_config is defined -%} - {%- set conf_net_config = conf.net_config -%} - {%- elif conf.idf.net_config is defined -%} - {%- set conf_net_config = conf.idf.net_config -%} - {%- endif -%} - {%- 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' -%} -- cgit 1.2.3-korg