6 files changed, 13 insertions, 3 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
index b34bec24..de6a1214 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
@@ -1,6 +1,7 @@
     mongodb:
       charm: ./{{ ubuntu.release }}/mongodb
       num_units: 1
+      constraints: *oam-space-constr
 {% if os.service.bindings %}
       bindings:
         "": *internal-space
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index 0e1133ad..cdbe4869 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -83,6 +83,7 @@
       charm: "./{{ ubuntu.release }}/ceph-radosgw"
       num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }}
 {% if os.service.bindings %}
+      constraints: *ceph-access-constr
       bindings:
         "": *oam-space
         public: *public-space
diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
index 027fc045..0313f07c 100644
--- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
@@ -6,6 +6,7 @@
       num_units: {{ unit_qty() }}
 {% endif %}
 {% if os.service.bindings %}
+      constraints: *ceph-access-constr
       bindings:
         "": *oam-space
         public: *public-space
diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
index 198cefb7..fe991f0a 100644
--- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
@@ -2,6 +2,7 @@
       charm: "./{{ ubuntu.release }}/glance"
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
+     constraints: *ceph-access-constr
       bindings:
         "": *oam-space
         public: *public-space
diff --git a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
index 5e240e24..9132096e 100644
--- a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
@@ -2,6 +2,7 @@
       charm: "./{{ ubuntu.release }}/openstack-dashboard"
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
+      constraints: *oam-space-constr
       bindings:
         "": *public-space
         shared-db: *internal-space
diff --git a/ci/config_tpl/juju2/bundle_tpl/spaces.yaml b/ci/config_tpl/juju2/bundle_tpl/spaces.yaml
index 73096ef5..acf2204b 100644
--- a/ci/config_tpl/juju2/bundle_tpl/spaces.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/spaces.yaml
@@ -44,7 +44,13 @@
 
     # CEPH configuration
     # CEPH access network
-    ceph-public-space:   &ceph-public-space   internal-api
+{% if opnfv.spaces_dict.storageaccess is defined %}
+    ceph-public-space:   &ceph-public-space  storage-access-space
+    ceph-access-constr:  &ceph-access-constr  spaces=storage-access-space
+{% else %}
+    ceph-public-space:   &ceph-public-space  internal-api
+    ceph-access-constr:  &ceph-access-constr  spaces=internal-api
+{% endif %}
 
     # CEPH replication network
 {% if opnfv.spaces_dict.storage is defined %}
@@ -54,8 +60,7 @@
 {% endif %}
 
     # Workaround for 'only one default binding supported'
-    oam-space-constr:    &oam-space-constr    spaces=oam-space
-    ceph-access-constr:  &ceph-access-constr  spaces=ceph-access-space
+    oam-space-constr:    &oam-space-constr    spaces=internal-api
 
     # CEPH OSD and journal devices; temporary workaround for #1674148
 {% if os.lxd %}