diff options
| author |   Jack Morgan <jack.morgan@intel.com> | 2017-12-18 15:12:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-18 15:12:27 +0000 |
| commit | 08d4886286298a669af2025c995799a3896c4313 (patch) | |
| tree | 1d59c724baae8b5b764fc66a3a2f0ad0f0e09b91 /config | |
| parent | 771ea333aff9847eb69a5360e64c1779ca1db1df (diff) | |
| parent | 4dce570ecea6e804d65abcbe2f708d5bc4bf855f (diff) | |
Merge "[fuel] Use PXE interface index from net_config" into stable/euphrates
Diffstat (limited to 'config')
| -rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 4 |
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 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: |