From: Jack Morgan <jack.morgan@intel.com>
Date: Mon, 18 Dec 2017 15:12:27 +0000 (+0000)
Subject: Merge "[fuel] Use PXE interface index from net_config" into stable/euphrates
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=08d4886286298a669af2025c995799a3896c4313;hp=771ea333aff9847eb69a5360e64c1779ca1db1df;p=pharos.git

Merge "[fuel] Use PXE interface index from net_config" into stable/euphrates
---

diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index 438891ee..ab3889ce 100644
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@ -8,6 +8,7 @@
     {%- if conf.net_config.public.dns is defined -%}
         {%- set dns_public = conf['net_config']['public']['dns'] -%}
     {%- endif -%}
+    {%- set pxe_interface = conf['net_config']['admin']['interface'] -%}
 {%- else -%}
     {%- set net_admin = '192.168.11.0' -%}
     {%- set net_mgmt = '172.16.10.0' -%}
@@ -15,13 +16,12 @@
     {%- set net_public = '172.30.10.0' -%}
     {%- set vlan_mgmt = '300' -%}
     {%- set vlan_private = '1000' -%}
+    {%- set pxe_interface = 0 -%}
 {%- endif -%}
 
 {%- if dns_public is not defined -%}
     {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%}
 {%- endif -%}
-
-{%- set pxe_interface = 0 -%}
 ---
 parameters:
   _param: