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

[pharos.git] / config / installers / fuel / pod_config.yml.j2

diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index 3cb4e2c..6d0e797 100644 (file)
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 ---
 {%- if conf.idf is defined and conf.idf.fuel is defined -%}
   {%- if conf.idf.net_config is defined -%}
@@ -41,6 +48,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) }}
@@ -49,9 +57,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) }}
@@ -62,6 +69,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) }}