diff options
| author |   Jack Morgan <jack.morgan@intel.com> | 2017-09-26 14:29:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-26 14:29:42 +0000 |
| commit | c4b4629b59923e049500fc776b8a251d4cd4c3b9 (patch) | |
| tree | 7606e2c783e23aa36fb5388a4afaa6cc8c6bcde2 /config | |
| parent | e004049299efbcfd67e8ed22e907e52fa1d7cf22 (diff) | |
| parent | eeb38b5a9e900d2e0e1e52276f6b2e533eee4b1c (diff) | |
Merge "Updated fuel adapter (ODL)"
Diffstat (limited to 'config')
| -rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 13 |
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 370a3b95..5406d76f 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 = '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'] }} |