diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-05 19:09:05 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-05 19:10:11 -0500 |
| commit | 669a243f81e11b1fb4e74ac58f8c6f426f1c7751 (patch) | |
| tree | 8f3d574eba4346e83a19849e0acbcf8cc2894935 /ci/config_tpl | |
| parent | 0f81e81552bdf0053fc0303c53dff455c17d56a6 (diff) | |
corrected the files as per review comment.
Change-Id: Ib7ad9bdb54b29db25d37d80ad9c1259734032ef2
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl')
| -rw-r--r-- | ci/config_tpl/bundle_tpl/neutron-gateway.yaml | 2 | ||||
| -rw-r--r-- | ci/config_tpl/bundle_tpl/neutron-ovs.yaml | 2 | ||||
| -rw-r--r-- | ci/config_tpl/deployconfig.yaml | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/ci/config_tpl/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/bundle_tpl/neutron-gateway.yaml index 74743ef7..07195503 100644 --- a/ci/config_tpl/bundle_tpl/neutron-gateway.yaml +++ b/ci/config_tpl/bundle_tpl/neutron-gateway.yaml @@ -3,8 +3,6 @@ options: {% if opnfv.spaces_dict.data is defined %} os-data-network: {{ opnfv.spaces_dict.data.cidr }} -{% else %} - #os-data-network: {{ opnfv.spaces_dict.data.cidr }} {% endif %} {% if os.network.controller == 'nosdn' %} {% if opnfv.ext_port is defined %} diff --git a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml index 087783d8..6823ca86 100644 --- a/ci/config_tpl/bundle_tpl/neutron-ovs.yaml +++ b/ci/config_tpl/bundle_tpl/neutron-ovs.yaml @@ -3,8 +3,6 @@ options: {% if opnfv.spaces_dict.data is defined %} os-data-network: {{ opnfv.spaces_dict.data.cidr }} -{% else %} - #os-data-network: {{ opnfv.spaces_dict.data.cidr }} {% endif %} {% if os.network.dpdk %} enable-dpdk: true 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 |