1 files changed, 16 insertions, 37 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index 5dd544ed..0d4866d7 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -4,20 +4,14 @@
       num_units: {{ unit_ceph_qty() }}
 {% if os.service.bindings %}
       bindings:
-        "": internal-api
-{% if opnfv.spaces_dict.storage is defined %}
-        cluster: storage-cluster
-{% endif %}
+        "": *oam-space
+        public: *ceph-public-space
 {% endif %}
       options:
         monitor-count: {{ unit_ceph_qty() }}
         fsid: ecbb8960-0e21-11e2-b495-83a88f44db01
         monitor-secret: AQD1P2xQiKglDhAA4NGUF5j38Mhq56qwz+45wg==
-{% if ubuntu.release == 'trusty' and os.release < 'newton' %}
-        source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
-{% elif ubuntu.release == 'xenial' and os.release >= 'newton' %}
-        source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
-{% endif %}
+        source: *openstack-origin
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
@@ -50,23 +44,15 @@
 {% endif %}
 {% if os.service.bindings %}
       bindings:
-        "": internal-api
-{% if opnfv.spaces_dict.storage is defined %}
-        cluster: storage-cluster
-{% endif %}
+        "": *oam-space
+        public: *ceph-public-space
+        cluster: *ceph-cluster-space
 {% endif %}
       options:
-{% if os.lxd %}
-        osd-devices: /srv/ceph-osd
-{% else %}
-        osd-devices: {{ opnfv.storage_dict.ceph.disk }}
-{% endif %}
+        osd-devices: *osd-devices
+        osd-journal: *osd-journal
         osd-reformat: 'yes'
-{% if ubuntu.release == 'trusty' and os.release < 'newton' %}
-        source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
-{% elif ubuntu.release == 'xenial' and os.release >= 'newton' %}
-        source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
-{% endif %}
+        source: *openstack-origin
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
@@ -97,23 +83,16 @@
       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 %}
-        public: public-api
-{% else %}
-        public: internal-api
-{% endif %}
+        "": *oam-space
+        public: *public-space
+        admin: *admin-space
+        internal: *internal-space
+        mon: *ceph-public-space
 {% endif %}
       options:
-        region: {{ os.region }}
+        region: *openstack-region
         operator-roles: "Member,admin"
-{% if ubuntu.release == 'trusty' and os.release < 'newton' %}
-        source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
-{% elif ubuntu.release == 'xenial' and os.release >= 'newton' %}
-        source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
-{% endif %}
+        source: *openstack-origin
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}