From: Guillermo Herrero <guillermo.herrero@enea.com>
Date: Mon, 20 Nov 2017 10:33:29 +0000 (+0100)
Subject: [fuel] extend public gateway support
X-Git-Tag: 6.0.0~67^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fab36e5a768adb126d0494e3a360d5e86eb1f213;p=pharos.git

[fuel] extend public gateway support

JIRA: FUEL-305

Change-Id: Ic5a2d499925aeec5b597394a059640ddae83fb2d
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
---

diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index 28c0b47b..392ca90f 100644
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@ -9,6 +9,9 @@
         {%- set dns_public = conf['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'] -%}
+    {%- endif -%}
 {%- else -%}
     {%- set net_admin = '192.168.11.0' -%}
     {%- set net_mgmt = '172.16.10.0' -%}
@@ -22,6 +25,9 @@
 {%- if dns_public is not defined -%}
     {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%}
 {%- endif -%}
+{%- if net_public_gw is not defined -%}
+    {%- set net_public_gw =  net_public | ipaddr_index('1')  -%}
+{%- endif -%}
 ---
 parameters:
   _param:
@@ -46,6 +52,8 @@ parameters:
     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_proxy_node01_control_address: {{ net_mgmt | ipaddr_index('104') }}
+    opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | 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') }}
@@ -76,6 +84,7 @@ parameters:
 
     opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index('111') }}
 
+    opnfv_net_public_gw: {{ net_public_gw }}
     opnfv_name_servers: {{ dns_public }}
     opnfv_dns_server01: '{{ dns_public[0] }}'