From 7d911eb5fcf4066a11ff34761d44a22c4fc7d877 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Mon, 14 Aug 2017 12:15:13 -0500 Subject: Adding the storage space support in case it is defined. Change-Id: Ic394674dd026f834dcee0db566dff7c654a2dba3 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'ci/config_tpl') diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml index 6b20d986..71a0264d 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml @@ -4,15 +4,11 @@ num_units: {{ unit_ceph_qty() }} {% if os.service.bindings %} bindings: -{% if opnfv.spaces_dict.public is defined %} - public: internal-api -{% else %} - public: internal-api -{% endif %} + "": internal-api {% if opnfv.spaces_dict.storage is defined %} - cluster: internal-api + public: storage-cluster {% else %} - cluster: internal-api + public: internal-api {% endif %} {% endif %} options: @@ -56,14 +52,12 @@ {% endif %} {% if os.service.bindings %} bindings: -{% if opnfv.spaces_dict.public is defined %} - public: internal-api -{% else %} - public: internal-api -{% endif %} + "": internal-api {% if opnfv.spaces_dict.storage is defined %} - cluster: internal-api + public: storage-cluster + cluster: storage-cluster {% else %} + public: internal-api cluster: internal-api {% endif %} {% endif %} @@ -109,6 +103,7 @@ num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }} {% if os.service.bindings %} bindings: + "": internal-api internal: internal-api admin: internal-api {% if opnfv.spaces_dict.public is defined %} -- cgit 1.2.3-korg