summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Morgan <jack.morgan@intel.com>2017-12-14 01:11:13 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-14 01:11:13 +0000
commitff8457dedbdad4207557d9b9d91000a1b2990d34 (patch)
tree02c3cf6cc0ae8d5b78fd034998bac84d8495f666
parent7d5c9adb99dafcb4d205e360e6175b0aae23dd69 (diff)
parent76647b9ae810c93ec779c14a16d3a504a69fffa3 (diff)
Merge "Updated fuel adapter (ODL)" into stable/euphrates
-rw-r--r--config/installers/fuel/pod_config.yml.j213
1 files changed, 8 insertions, 5 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index 04be321e..b412885f 100644
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/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 = '1000' -%}
{%- 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 -%}
@@ -73,11 +74,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'].rsplit('/')[0]}}