From 5e51953867ed1062954daaa728b32432ba669c32 Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Fri, 8 Sep 2017 15:36:27 +0800 Subject: Make daisy template compatible with lf-pod4 Now the daisy template is not compatible with lf-pod4, see [1]. The meaning of 'interfaces' in this pod is different with other pods. Make daisy template compatible with it. [1] https://build.opnfv.org/ci/job/validate-jinja2-templates-master/80/console Change-Id: I29058f705bab333c48614b7eab8c8b9e83b9e1cb Signed-off-by: Alex Yang --- installers/daisy/pod_config.yaml.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/installers/daisy/pod_config.yaml.j2 b/installers/daisy/pod_config.yaml.j2 index 39be297..9a4ac7b 100644 --- a/installers/daisy/pod_config.yaml.j2 +++ b/installers/daisy/pod_config.yaml.j2 @@ -43,5 +43,9 @@ hosts: disks: daisy: 50 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] }} +{%- endif %} ceph_disk_name: '/dev/sdb' -- cgit 1.2.3-korg