From 3240e47c77172eef852a187ce3900112f89e1785 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Sun, 3 Sep 2017 17:25:18 -0500 Subject: modified to include rados gateway with vip. Change-Id: I5828c3b37e71da04515867f7e7d2b5bd10e9f9b1 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'ci/config_tpl/juju2/bundle_tpl/ceph.yaml') diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml index 7fa9a8a0..0568b38a 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml @@ -79,7 +79,7 @@ {% endif %} ceph-radosgw: charm: "./{{ ubuntu.release }}/ceph-radosgw" - num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }} + num_units: {{ unit_qty() }} {% if os.service.bindings %} constraints: *ceph-access-constr bindings: @@ -98,9 +98,12 @@ {% endif %} {% if opnfv.storage_dict.ceph is defined %} ceph-osd-replication-count: {{ unit_ceph_qty() }} +{% endif %} +{% if os.ha.mode == 'ha' %} + vip: {{ opnfv.vip.radosgw }} {% endif %} to: -{% for unit_id in to_select(unit_qty() if os.beta.hacluster_ceph_radosgw else 1) %} +{% for unit_id in to_select(unit_qty()) %} - "lxd:nodes/{{ unit_id }}" {% endfor %} {% endif %} -- cgit 1.2.3-korg