From 669a243f81e11b1fb4e74ac58f8c6f426f1c7751 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 5 Aug 2016 19:09:05 -0500 Subject: corrected the files as per review comment. Change-Id: Ib7ad9bdb54b29db25d37d80ad9c1259734032ef2 Signed-off-by: Narinder Gupta --- ci/config_tpl/deployconfig.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'ci/config_tpl/deployconfig.yaml') diff --git a/ci/config_tpl/deployconfig.yaml b/ci/config_tpl/deployconfig.yaml index 3bc2ebc2..c190d1dd 100644 --- a/ci/config_tpl/deployconfig.yaml +++ b/ci/config_tpl/deployconfig.yaml @@ -4,14 +4,18 @@ opnfv: admNetwork: {{ net_prefix }}2 admin_password: openstack ceph-disk: {{ opnfv.storage_dict.ceph.disk }} +{% if opnfv.spaces_dict.data is defined %} dataNetwork: {{ opnfv.spaces_dict.data.cidr }} +{% endif %} domain: {{ lab.racks[0].osdomainname }} ext-port: {{ lab.racks[0]['ext-port'] }} ext_port: {{ lab.racks[0]['ext-port'] }} floating-ip-range: {{ lab.racks[0]['floating-ip-range'] }} interface-enable: {{ lab.racks[0].ifnamelist }} os-domain-name: {{ lab.racks[0].osdomainname }} - publicNetwork: {{ opnfv.spaces_dict.public.cidr if 'public' in opnfv.spaces_dict else '' }} +{% if opnfv.spaces_dict.public is defined %} + publicNetwork: {{ opnfv.spaces_dict.public.cidr }} +{% endif %} spaces: {% for net in opnfv.spaces %} - bridge: {{ net.bridge }} @@ -25,7 +29,9 @@ opnfv: - disk: {{ storage.disk }} type: {{ storage.type }} {% endfor %} - storageNetwork: {{ opnfv.spaces_dict.storage.cidr if 'storage' in opnfv.spaces_dict else '' }} +{% if opnfv.spaces_dict.storage is defined %} + storageNetwork: {{ opnfv.spaces_dict.storage.cidr }} +{% endif %} units: {{ lab.racks[0].nodes|count }} vip: ceilometer: {{ net_prefix }}24 -- cgit 1.2.3-korg