From: Alex Yang <yangyang1@zte.com.cn>
Date: Tue, 16 Jan 2018 10:03:59 +0000 (+0800)
Subject: Fix daisy gateway generated by PDF
X-Git-Tag: 6.0.0~33
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F50679%2F1;p=pharos.git

Fix daisy gateway generated by PDF

Fixed_ips were removed from the PDF. So we need get gateway address
from the 'interfaces'.

Change-Id: Ie6adbf4ef3cbde05bb2fb114a58395dda8ae50fb
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
---

diff --git a/config/installers/daisy/pod_config.yaml.j2 b/config/installers/daisy/pod_config.yaml.j2
index 3e4ab106..8057f68c 100644
--- a/config/installers/daisy/pod_config.yaml.j2
+++ b/config/installers/daisy/pod_config.yaml.j2
@@ -86,6 +86,6 @@ daisy_passwd: 'r00tme'
 {% if 'fixed_ips' in conf['jumphost'] -%}
 daisy_gateway: {{ conf['jumphost']['fixed_ips']['admin'] }}
 {%- else -%}
-daisy_gateway: {{ conf['jumphost']['interfaces'][0]['address'][0] }}
+daisy_gateway: {{ conf['jumphost']['interfaces'][0]['address'] }}
 {%- endif %}
 ceph_disk_name: '/dev/sdb'