From 1e35f14466291b34ec10e8c63e070d9d50681593 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 <Alexandru.Avadanii@enea.com>
---
 config/installers/daisy/network.yaml.j2  |  8 +-------
 config/installers/fuel/pod_config.yml.j2 | 29 ++++++++++++-----------------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/config/installers/daisy/network.yaml.j2 b/config/installers/daisy/network.yaml.j2
index c344688e..f5ac6150 100644
--- a/config/installers/daisy/network.yaml.j2
+++ b/config/installers/daisy/network.yaml.j2
@@ -39,18 +39,12 @@ network-config-metadata:
     {%- set installer = "fuel" -%}
   {%- endif %}
 
-{%- 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 %}
-
 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 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