summaryrefslogtreecommitdiffstats
path: root/ci/bundle_tpl/ceph.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/bundle_tpl/ceph.yaml')
-rw-r--r--ci/bundle_tpl/ceph.yaml14
1 files changed, 2 insertions, 12 deletions
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 }}