aboutsummaryrefslogtreecommitdiffstats
path: root/installers
diff options
context:
space:
mode:
authorGuillermo Herrero <guillermo.herrero@enea.com>2017-09-26 11:33:26 +0200
committerGuillermo Herrero <guillermo.herrero@enea.com>2017-10-31 14:28:58 +0000
commitea48c8eca3bfcaed19af56e6c5bbd494f5d387f3 (patch)
treed7712c5afb2ba71bba28cbb155b694679d7e5f40 /installers
parentdcfebeed6a540b3da2470962eb7a96dc7a3500ef (diff)
[fuel] Updated adapter template
Change-Id: Ibda422d7b4042e9b2e6c54eae66bd76f1cde0a1e Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> (cherry picked from commit eab331ec734da213fee17643e5a32cbc53a5de15)
Diffstat (limited to 'installers')
-rw-r--r--installers/fuel/pod_config.yml.j213
1 files changed, 8 insertions, 5 deletions
diff --git a/installers/fuel/pod_config.yml.j2 b/installers/fuel/pod_config.yml.j2
index 370a3b9..5406d76 100644
--- a/installers/fuel/pod_config.yml.j2
+++ b/installers/fuel/pod_config.yml.j2
@@ -5,6 +5,9 @@
{%- 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'] -%}
+ {%- endif -%}
{%- else -%}
{%- set net_admin = '192.168.11.0' -%}
{%- set net_mgmt = '172.16.10.0' -%}
@@ -14,9 +17,7 @@
{%- set vlan_private = '302' -%}
{%- endif -%}
-{%- if conf.net_config.public.dns is defined -%}
- {%- set dns_public = conf['net_config']['public']['dns'] -%}
-{%- else -%}
+{%- if dns_public is not defined -%}
{%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%}
{%- endif -%}
@@ -72,11 +73,13 @@ parameters:
opnfv_openstack_compute_node01_external_address: {{ net_public | ipaddr_index('101') }}
opnfv_openstack_compute_node02_external_address: {{ net_public | ipaddr_index('102') }}
+ opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index('111') }}
+
opnfv_name_servers: {{ dns_public }}
opnfv_dns_server01: '{{ dns_public[0] }}'
- opnfv_net_mgmt_vlan: {{ conf['net_config']['mgmt']['vlan'] }}
- opnfv_net_tenant_vlan: {{ conf['net_config']['private']['vlan'] }}
+ opnfv_net_mgmt_vlan: {{ vlan_mgmt }}
+ opnfv_net_tenant_vlan: {{ vlan_private }}
opnfv_maas_node01_architecture: '{{ conf['nodes'][0]['node']['arch'] | dpkg_arch }}/generic'
opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'] }}