From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Mon, 14 Aug 2017 17:15:13 +0000 (-0500)
Subject: Adding the storage space support in case it is defined.
X-Git-Tag: opnfv-5.0.RC1~61
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7d911eb5fcf4066a11ff34761d44a22c4fc7d877;p=joid.git

Adding the storage space support in case it is defined.

Change-Id: Ic394674dd026f834dcee0db566dff7c654a2dba3
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 60ed0855..f79ea5bf 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -319,8 +319,8 @@ setupspacenetwork(){
             'admin')           JUJU_SPACE="internal-api";  DHCP='enabled' ;;
             'data')            JUJU_SPACE="tenant-data";   DHCP='' ;;
             'public')          JUJU_SPACE="public-api";    DHCP='' ;;
-            'storage')         JUJU_SPACE="tenant-stor";   DHCP='' ;;
-            'storagecluster')  JUJU_SPACE="storclus";      DHCP='' ;;
+            'storage')         JUJU_SPACE="storage-cluster";   DHCP='' ;;
+            'storageaccess')  JUJU_SPACE="storage-data";      DHCP='' ;;
             'floating')        JUJU_SPACE="tenant-public"; DHCP='' ;;
             *)                 JUJU_SPACE='default';       DHCP='OFF'; echo_info "      >>> Unknown SPACE" ;;
         esac
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 %}