[fuel] pod_config: Consume newly added MaaS props

[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 7443096..dfa9679 100644 (file)
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@ -5,38 +5,44 @@
 # 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 -%}
-      {%- 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.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' -%}
-      {%- set net_mgmt = '172.16.10.0' -%}
-      {%- set net_private = '10.1.0.0' -%}
-      {%- set net_public = '172.30.10.0' -%}
-      {%- set vlan_mgmt = '300' -%}
-      {%- set vlan_private = '1000' -%}
-      {%- set pxe_interface = 0 -%}
-  {%- endif -%}
+{%- 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 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 %}
+    {%- set dns_public = conf.idf.net_config.public.dns %}
+{%- endif %}
+{%- 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 %}
+{%- if conf.idf.fuel.network.public_pool is defined %}
+    {%- set net_public_pool_start = conf.idf.fuel.network.public_pool.start_ip %}
+    {%- set net_public_pool_end = conf.idf.fuel.network.public_pool.end_ip %}
+{%- endif %}
+{%- if conf.idf.fuel.maas is defined %}
+    {%- set maas_timeout_comissioning = conf.idf.fuel.maas.timeout_comissioning %}
+    {%- set maas_timeout_deploying = conf.idf.fuel.maas.timeout_deploying %}
+{%- endif %}
 
-  {%- 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 %}
+{%- 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 %}
+{%- if net_public_pool_start is not defined or net_public_pool_end is not defined %}
+    {%- set net_public_pool_start = net_public | ipaddr_index('80') %}
+    {%- set net_public_pool_end = net_public | ipaddr_index('100') %}
+{%- endif %}
+{%- if maas_timeout_comissioning is not defined or maas_timeout_deploying is not defined %}
+    {%- set maas_timeout_comissioning = 10 %}
+    {%- set maas_timeout_deploying = 15 %}
+{%- endif %}
+---
 parameters:
   _param:
 
@@ -61,9 +67,12 @@ parameters:
     opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index(124) }}
     opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index(125) }}
     opnfv_openstack_gateway_node03_address: {{ net_mgmt | ipaddr_index(126) }}
-    opnfv_openstack_gateway_node01_tenant_address: {{ net_private | ipaddr_index(6) }}
-    opnfv_openstack_gateway_node02_tenant_address: {{ net_private | ipaddr_index(7) }}
-    opnfv_openstack_gateway_node03_tenant_address: {{ net_private | ipaddr_index(9) }}
+    opnfv_openstack_gateway_node01_tenant_address: {{ net_private | ipaddr_index(124) }}
+    opnfv_openstack_gateway_node02_tenant_address: {{ net_private | ipaddr_index(125) }}
+    opnfv_openstack_gateway_node03_tenant_address: {{ net_private | ipaddr_index(126) }}
+    opnfv_openstack_gateway_node01_external_address: {{ net_public | ipaddr_index(124) }}
+    opnfv_openstack_gateway_node02_external_address: {{ net_public | ipaddr_index(125) }}
+    opnfv_openstack_gateway_node03_external_address: {{ net_public | ipaddr_index(126) }}
     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) }}
@@ -74,6 +83,9 @@ parameters:
     opnfv_openstack_control_node01_address: {{ net_mgmt | ipaddr_index(11) }}
     opnfv_openstack_control_node02_address: {{ net_mgmt | ipaddr_index(12) }}
     opnfv_openstack_control_node03_address: {{ net_mgmt | ipaddr_index(13) }}
+    opnfv_openstack_control_node01_external_address: {{ net_public | ipaddr_index(11) }}
+    opnfv_openstack_control_node02_external_address: {{ net_public | ipaddr_index(12) }}
+    opnfv_openstack_control_node03_external_address: {{ net_public | ipaddr_index(13) }}
     opnfv_openstack_database_address: {{ net_mgmt | ipaddr_index(50) }}
     opnfv_openstack_database_node01_address: {{ net_mgmt | ipaddr_index(51) }}
     opnfv_openstack_database_node02_address: {{ net_mgmt | ipaddr_index(52) }}
@@ -100,13 +112,20 @@ 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_pool_start }}
+    opnfv_net_public_pool_end: {{ net_public_pool_end }}
     opnfv_name_servers: {{ dns_public }}
     opnfv_dns_server01: '{{ dns_public[0] }}'
 
     opnfv_net_mgmt_vlan: {{ vlan_mgmt }}
     opnfv_net_tenant_vlan: {{ vlan_private }}
 
+    opnfv_maas_timeout_comissioning: {{ maas_timeout_comissioning }}
+    opnfv_maas_timeout_deploying: {{ maas_timeout_deploying }}
+
     opnfv_maas_node01_architecture: '{{ conf.nodes.0.node.arch | dpkg_arch }}/generic'
     opnfv_maas_node01_power_address: {{ conf.nodes.0.remote_management.address.rsplit('/')[0] }}
     opnfv_maas_node01_power_type: {{ conf.nodes.0.remote_management.type }}
@@ -141,4 +160,3 @@ parameters:
     opnfv_maas_node05_power_user: {{ conf.nodes.4.remote_management.user }}
     opnfv_maas_node05_power_password: {{ conf.nodes.4.remote_management.pass }}
     opnfv_maas_node05_interface_mac: '{{ conf.nodes.4.interfaces[pxe_interface].mac_address }}'
-{%- endif -%}