summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Morgan <jack.morgan@intel.com>2017-12-07 19:34:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-07 19:34:14 +0000
commitc79c41cb0ed7a4749bbf2e1261b73bce12c7b802 (patch)
tree92f7cb519450fe901726ed73b3188cf960b61c86
parent202aa48939dd66ff312027e90ee854095b066f52 (diff)
parent30ce269378cefdd14377c838687c4052d8c7e55d (diff)
Merge "[fuel] Use PXE interface index from net_config"
-rw-r--r--config/installers/fuel/pod_config.yml.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index c2f1403..59659aa 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: