From 77b600ef0d64210c1b5fd72581cfe7752fa00c8c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 1 Feb 2018 18:45:39 +0100 Subject: [fuel] pod_config: Consume newly added MaaS props Change-Id: I23446e82dd148afd14d56717dd35fe0ee271d971 Signed-off-by: Alexandru Avadanii --- config/installers/fuel/pod_config.yml.j2 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 65336a5b..dfa9679d 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -23,6 +23,10 @@ {%- 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' ] %} @@ -34,6 +38,10 @@ {%- 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: @@ -115,6 +123,9 @@ parameters: 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 }} -- cgit 1.2.3-korg