diff options
Diffstat (limited to 'config/installers/fuel')
| -rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 0b19eee3..74430961 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -7,19 +7,19 @@ ############################################################################## --- {%- if conf.idf is defined and conf.idf.fuel is defined -%} - {%- if conf.net_config is defined -%} - {%- set net_admin = conf.net_config.admin.network -%} - {%- set net_mgmt = conf.net_config.mgmt.network -%} - {%- set net_private = conf.net_config.private.network -%} - {%- set net_public = conf.net_config.public.network -%} - {%- set vlan_mgmt = conf.net_config.mgmt.vlan -%} - {%- set vlan_private = conf.net_config.private.vlan -%} - {%- if conf.net_config.public.dns is defined -%} - {%- set dns_public = conf.net_config.public.dns -%} + {%- if conf.idf.net_config is defined -%} + {%- set net_admin = conf.idf.net_config.admin.network -%} + {%- 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 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 -%} + {%- set dns_public = conf.idf.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 -%} + {%- set pxe_interface = conf.idf.net_config.admin.interface -%} + {%- if conf.idf.net_config.public.gateway is defined -%} + {%- set net_public_gw = conf.idf.net_config.public.gateway -%} {%- endif -%} {%- else -%} {%- set net_admin = '192.168.11.0' -%} @@ -46,6 +46,7 @@ parameters: opnfv_jump_bridge_public: {{ conf.idf.fuel.jumphost.bridges.public }} opnfv_infra_config_address: {{ net_mgmt | ipaddr_index(100) }} + opnfv_infra_config_pxe_address: {{ net_admin | ipaddr_index(2) }} opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index(3) }} opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index(3) }} opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index(140) }} @@ -54,9 +55,8 @@ parameters: opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index(143) }} opnfv_infra_maas_pxe_network_address: {{ net_admin }} - opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index(3) }} - opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index(5) }} - opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index(250) }} + opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index(4) }} + opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index(100) }} opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index(124) }} opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index(125) }} @@ -67,6 +67,7 @@ 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_control_address: {{ net_mgmt | ipaddr_index(103) }} 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) }} |