diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-15 08:41:55 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-15 09:18:31 -0500 |
| commit | b4c1448a8548b75de14915110abc4a0be292482a (patch) | |
| tree | 0dd882337ccbbb7ab72fe1f418eb49f4275ffa3a /ci/config_tpl/bundle_tpl/ceph.yaml | |
| parent | 86c767d5c762fc1555f54a7a9ec9029617c6950e (diff) | |
added option to choose the architecture of hyperconverged ot not.
Change-Id: If5d83b221ce1481014f2e76816a7fe568e656904
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/bundle_tpl/ceph.yaml')
| -rw-r--r-- | ci/config_tpl/bundle_tpl/ceph.yaml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/ci/config_tpl/bundle_tpl/ceph.yaml b/ci/config_tpl/bundle_tpl/ceph.yaml index 82cfd283..da1e8b54 100644 --- a/ci/config_tpl/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/bundle_tpl/ceph.yaml @@ -15,14 +15,30 @@ {% endfor %} ceph-osd: charm: "local:{{ ubuntu.release }}/ceph-osd" +{% if os.hyperconverged %} num_units: {{ opnfv.units }} +{% else %} + num_units: 3 +{% endif %} options: osd-devices: {{ opnfv.storage_dict.ceph.disk }} osd-reformat: 'yes' to: +{% if os.hyperconverged %} {% for unit_id in range(0, opnfv.units) %} - "nodes={{ unit_id }}" {% endfor %} +{% else %} +{% if os.ha.mode == 'ha' %} +{% for unit_id in range(0, 3) %} + - "nodes={{ unit_id }}" +{% endfor %} +{% else %} + - "nodes=0" + - "nodes-compute=0" + - "nodes-compute=1" +{% endif %} +{% endif %} ceph-radosgw: charm: "local:{{ ubuntu.release }}/ceph-radosgw" num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }} |