From: Guillermo Herrero <guillermo.herrero@enea.com>
Date: Tue, 16 Jan 2018 11:59:23 +0000 (+0100)
Subject: [fuel] Add support to use public net netmask from IDF
X-Git-Tag: 6.0.0~22^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F50697%2F6;p=pharos.git

[fuel] Add support to use public net netmask from IDF

- New reclass params for public network and public network mask
- Network mask is converted from prefix format to reclass compatible IP format
- New reclass params to set public pool ip range

JIRA: FUEL-315

Change-Id: I30c5332b958796af5a10cd39c56ed5cf5800e029
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 8a4d869e..3cb4e2c3 100644
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@ -5,6 +5,7 @@
       {%- set net_mgmt = conf.idf.net_config.mgmt.network -%}
       {%- set net_private = conf.idf.net_config.private.network -%}
       {%- set net_public = conf.idf.net_config.public.network -%}
+      {%- set net_public_mask = conf.idf.net_config.public.mask -%}
       {%- set vlan_mgmt = conf.idf.net_config.mgmt.vlan -%}
       {%- set vlan_private = conf.idf.net_config.private.vlan -%}
       {%- if conf.idf.net_config.public.dns is defined -%}
@@ -19,6 +20,7 @@
       {%- set net_mgmt = '172.16.10.0' -%}
       {%- set net_private = '10.1.0.0' -%}
       {%- set net_public = '172.30.10.0' -%}
+      {%- set net_public_mask = '24' -%}
       {%- set vlan_mgmt = '300' -%}
       {%- set vlan_private = '1000' -%}
       {%- set pxe_interface = 0 -%}
@@ -29,7 +31,7 @@
   {%- endif -%}
   {%- if net_public_gw is not defined -%}
       {%- set net_public_gw =  net_public | ipaddr_index('1')  -%}
-  {%- endif %}
+  {%- endif -%}
 parameters:
   _param:
 
@@ -92,7 +94,11 @@ parameters:
 
     opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index(111) }}
 
+    opnfv_net_public: {{ net_public }}/{{ net_public_mask }}
+    opnfv_net_public_mask: {{ net_public_mask | netmask }}
     opnfv_net_public_gw: {{ net_public_gw }}
+    opnfv_net_public_pool_start: {{ net_public | ipaddr_index(80) }}
+    opnfv_net_public_pool_end: {{ net_public | ipaddr_index(100) }}
     opnfv_name_servers: {{ dns_public }}
     opnfv_dns_server01: '{{ dns_public[0] }}'