From: Jack Morgan <jack.morgan@intel.com>
Date: Thu, 7 Dec 2017 19:34:14 +0000 (+0000)
Subject: Merge "[fuel] Use PXE interface index from net_config"
X-Git-Tag: 6.0.0~74
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c79c41cb0ed7a4749bbf2e1261b73bce12c7b802;hp=-c;p=pharos.git

Merge "[fuel] Use PXE interface index from net_config"
---

c79c41cb0ed7a4749bbf2e1261b73bce12c7b802
diff --combined config/installers/fuel/pod_config.yml.j2
index c2f14035,56fd0e3e..59659aa3
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@@ -8,6 -8,7 +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 +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:
@@@ -43,9 -43,9 +43,9 @@@
      opnfv_openstack_gateway_node01_tenant_address: {{ net_private | ipaddr_index('6') }}
      opnfv_openstack_gateway_node02_tenant_address: {{ net_private | ipaddr_index('7') }}
      opnfv_openstack_gateway_node03_tenant_address: {{ net_private | ipaddr_index('9') }}
 -    opnfv_openstack_proxy_address: {{ net_mgmt | ipaddr_index('80') }}
 -    opnfv_openstack_proxy_node01_address: {{ net_mgmt | ipaddr_index('81') }}
 -    opnfv_openstack_proxy_node02_address: {{ net_mgmt | ipaddr_index('82') }}
 +    opnfv_openstack_proxy_address: {{ net_public | ipaddr_index('103') }}
 +    opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index('104') }}
 +    opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index('105') }}
      opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index('10') }}
      opnfv_openstack_control_node01_address: {{ net_mgmt | ipaddr_index('11') }}
      opnfv_openstack_control_node02_address: {{ net_mgmt | ipaddr_index('12') }}