diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-03 14:44:55 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-03 16:06:39 -0500 |
| commit | 4442a97ea68c07b073c847b1f61d0c5754a6fe13 (patch) | |
| tree | 9b25d49c55842c0e833cb7ee2c73a2c1be709375 /ci/bundle_tpl | |
| parent | 947016a2eb2be266c8eaf183ea904b2bc204776b (diff) | |
replace ext-port with data-port and bridge-map.
Change-Id: I7d89f57b4952d3054defb12b8e24360ea39cc91c
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/bundle_tpl')
| -rw-r--r-- | ci/bundle_tpl/ceph.yaml | 4 | ||||
| -rw-r--r-- | ci/bundle_tpl/neutron-gateway.yaml | 12 | ||||
| -rw-r--r-- | ci/bundle_tpl/neutron-ovs.yaml | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/ci/bundle_tpl/ceph.yaml b/ci/bundle_tpl/ceph.yaml index 01d62ca7..82cfd283 100644 --- a/ci/bundle_tpl/ceph.yaml +++ b/ci/bundle_tpl/ceph.yaml @@ -15,12 +15,12 @@ {% endfor %} ceph-osd: charm: "local:{{ ubuntu.release }}/ceph-osd" - num_units: {{ opnfv.units - 1 }} + num_units: {{ opnfv.units }} options: osd-devices: {{ opnfv.storage_dict.ceph.disk }} osd-reformat: 'yes' to: -{% for unit_id in range(1, opnfv.units) %} +{% for unit_id in range(0, opnfv.units) %} - "nodes={{ unit_id }}" {% endfor %} ceph-radosgw: diff --git a/ci/bundle_tpl/neutron-gateway.yaml b/ci/bundle_tpl/neutron-gateway.yaml index fd627642..2148fd79 100644 --- a/ci/bundle_tpl/neutron-gateway.yaml +++ b/ci/bundle_tpl/neutron-gateway.yaml @@ -3,8 +3,20 @@ 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 %} +{% if opnfv.data_port is defined %} + bridge-mappings: physnet1:br-data external:br-ex + data-port: br-data:{{ opnfv.data_port }} br-ex:{{ opnfv.ext_port }} +{% else %} + bridge-mappings: external:br-ex + data-port: br-ex:{{ opnfv.ext_port }} +{% endif %} +{% endif %} +{% else %} ext-port: {{ opnfv.ext_port }} {% endif %} {% if os.network.controller == 'odl' %} diff --git a/ci/bundle_tpl/neutron-ovs.yaml b/ci/bundle_tpl/neutron-ovs.yaml index c0d34689..6233421c 100644 --- a/ci/bundle_tpl/neutron-ovs.yaml +++ b/ci/bundle_tpl/neutron-ovs.yaml @@ -3,6 +3,8 @@ 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 |