From 1e67ca426ab0f454fc2d4845efd5d9984782a4db Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 21 Jul 2016 13:22:05 -0500 Subject: modified to maximize use of resource available at time of deployment. Change-Id: Ia769b4c87bafa62e58aa006468fbb2294da16766 Signed-off-by: Narinder Gupta --- ci/bundle_tpl/ceph.yaml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'ci/bundle_tpl/ceph.yaml') diff --git a/ci/bundle_tpl/ceph.yaml b/ci/bundle_tpl/ceph.yaml index 8ad6cbd6..a5060371 100644 --- a/ci/bundle_tpl/ceph.yaml +++ b/ci/bundle_tpl/ceph.yaml @@ -10,14 +10,9 @@ #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }} {% endif %} to: -{% if os.ha.mode == 'ha' %} -{% for unit_id in to_select() %} +{% for unit_id in to_select(unit_ceph_qty()) %} - "lxc:nodes={{ unit_id }}" {% endfor %} -{% else %} - - "lxc:nodes=0" - - "lxc:nodes=1" -{% endif %} ceph-osd: charm: "local:{{ ubuntu.release }}/ceph-osd" num_units: {{ unit_ceph_qty() }} @@ -25,14 +20,9 @@ osd-devices: {{ opnfv.storage_dict.ceph.disk }} osd-reformat: 'yes' to: -{% if os.ha.mode == 'ha' %} -{% for unit_id in to_select() %} +{% for unit_id in to_select(unit_ceph_qty()) %} - "nodes={{ unit_id }}" {% endfor %} -{% else %} - - "nodes=0" - - "nodes=1" -{% endif %} ceph-radosgw: charm: "local:{{ ubuntu.release }}/ceph-radosgw" num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }} -- cgit 1.2.3-korg