aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjulien zhang <zhang.jun3g@zte.com.cn>2017-09-10 14:47:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-10 14:47:14 +0000
commit10b15f330c433ef93537ec2371c8ebdcac55567e (patch)
treead5aa29905c91a5457e63f1382890b0bc6ba9423
parentf8c00de710bdcb64be43977c05b48be3f4a21a59 (diff)
parent5e51953867ed1062954daaa728b32432ba669c32 (diff)
Merge "Make daisy template compatible with lf-pod4"
-rw-r--r--installers/daisy/pod_config.yaml.j24
1 files changed, 4 insertions, 0 deletions
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'