[fuel] adapter: align IPs with recent Fuel changes

Change-Id: I44f63fb7f9e4398a16e1d0b897a2491a60bb1727
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/installers/fuel/pod_config.yml.j2 b/installers/fuel/pod_config.yml.j2
index 3457b75..5e6eb5b 100644 (file)
--- a/installers/fuel/pod_config.yml.j2
+++ b/installers/fuel/pod_config.yml.j2
@@ -3,9 +3,8 @@ parameters:
   _param:
     # infra service addresses
     opnfv_infra_config_address: {{ conf['net_config']['mgmt']['network'] | ipaddr_index('100') }}
-    opnfv_infra_maas_node01_address:  {{ conf['net_config']['mgmt']['network'] | ipaddr_index('2') }}
-    opnfv_infra_maas_node01_deploy_address: {{ conf['net_config']['admin']['network'] | ipaddr_index('2') }}
-    opnfv_infra_maas_node01_external_address: {{ conf['net_config']['public']['network'] | ipaddr_index('2') }}
+    opnfv_infra_maas_node01_address: {{ conf['net_config']['mgmt']['network'] | ipaddr_index('3') }}
+    opnfv_infra_maas_node01_deploy_address: {{ conf['net_config']['admin']['network'] | ipaddr_index('3') }}
     opnfv_infra_compute_node01_address: {{ conf['net_config']['mgmt']['network'] | ipaddr_index('141') }}
     opnfv_infra_compute_node02_address: {{ conf['net_config']['mgmt']['network'] | ipaddr_index('142') }}
     opnfv_infra_compute_node03_address: {{ conf['net_config']['mgmt']['network'] | ipaddr_index('143') }}
@@ -51,13 +50,13 @@ parameters:
     opnfv_openstack_compute_node01_external_address: {{ conf['net_config']['public']['network'] | ipaddr_index('101') }}
     opnfv_openstack_compute_node02_external_address: {{ conf['net_config']['public']['network'] | ipaddr_index('102') }}
 
-    {% if conf.net_config.public.dns is defined %}
+{% if conf.net_config.public.dns is defined %}
     opnfv_name_servers: {{ conf['net_config']['public']['dns'] }}
-    opnfv_dns_server01: {{ conf['net_config']['public']['dns'][0] }}
-    {% else %}
+    opnfv_dns_server01: '{{ conf['net_config']['public']['dns'][0] }}'
+{% else %}
     opnfv_name_servers: '8.8.8.8'
     opnfv_dns_server01: '8.8.8.8'
-    {% endif %}
+{% endif %}
     opnfv_net_mgmt_vlan: {{ conf['net_config']['mgmt']['vlan'] }}
     opnfv_net_tenant_vlan: {{ conf['net_config']['private']['vlan'] }}