diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2017-12-11 18:30:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-11 18:30:08 +0000 |
| commit | cf19f9ee69eacc1189cbeb746b30e3a09eaeac93 (patch) | |
| tree | f55c7cb43a3bbbdbb1ae6901c3ab9048693a5665 | |
| parent | a24e1a788afd96f8ce4ee2f3b4d888d7e39dfce1 (diff) | |
| parent | fab36e5a768adb126d0494e3a360d5e86eb1f213 (diff) | |
Merge "[fuel] extend public gateway support"
| -rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index eccdf5cd..28c61888 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: @@ -55,6 +61,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') }} @@ -85,6 +93,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] }}' |