diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-22 16:49:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-22 16:49:57 +0000 |
| commit | 2ff40f3189cae452cdb49fc4baf26f5eb94f81be (patch) | |
| tree | a2be5260cfa7d223ce571d3b9aa5db727a02707c /config | |
| parent | 9e19db65bb0e9e25b4d059bd58a0ff433badd3bc (diff) | |
| parent | 4cef6b2ac9c5dda31edd54c710b79f867eae881f (diff) | |
Merge "[fuel] Add support to use public net netmask from IDF"
Diffstat (limited to 'config')
| -rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 74430961..6d0e7978 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -12,6 +12,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 -%} @@ -26,6 +27,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 -%} @@ -36,7 +38,7 @@ {%- endif -%} {%- if net_public_gw is not defined -%} {%- set net_public_gw = net_public | ipaddr_index('1') -%} - {%- endif %} + {%- endif -%} parameters: _param: @@ -100,7 +102,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] }}' |