modified to have cph monitor in rados gateway.

[joid.git] / 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 412b966..eda8496 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -1,11 +1,20 @@
 {% if opnfv.storage_dict.ceph is defined %}
-    ceph:
-      charm: "./{{ ubuntu.release }}/ceph"
+    ceph-mon:
+      charm: "./{{ ubuntu.release }}/ceph-mon"
       num_units: {{ unit_ceph_qty() }}
+{% if os.service.bindings %}
+      bindings:
+        "": internal-api
+{% if opnfv.spaces_dict.storage is defined %}
+        public: storage-cluster
+{% else %}
+        public: internal-api
+{% endif %}
+{% endif %}
       options:
         monitor-count: {{ unit_ceph_qty() }}
-        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+        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' %}
@@ -13,9 +22,6 @@
 {% endif %}
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
-{% endif %}
-{% if opnfv.spaces_dict.storage is defined %}
-        #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
 {% endif %}
       to:
 {% if os.hyperconverged %}
@@ -29,19 +35,38 @@
 {% endfor %}
 {% else %}
         - "lxd:nodes/0"
-        - "lxd:nodes/0"
-        - "lxd:nodes/0"
+        - "lxd:nodes/1"
+        - "lxd:nodes/2"
 {% endif %}
 {% endif %}
     ceph-osd:
       charm: "./{{ ubuntu.release }}/ceph-osd"
 {% if os.hyperconverged %}
+{% if opnfv.units >= 3 %}
+      num_units: {{ unit_ceph_qty() }}
+{% else %}
       num_units: {{ opnfv.units }}
+{% endif %}
 {% else %}
       num_units: 3
+{% endif %}
+{% if os.service.bindings %}
+      bindings:
+        "": internal-api
+{% if opnfv.spaces_dict.storage is defined %}
+        public: storage-cluster
+        cluster: storage-cluster
+{% else %}
+        public: internal-api
+        cluster: internal-api
+{% endif %}
 {% endif %}
       options:
+{% if os.lxd %}
+        osd-devices: /srv/ceph-osd
+{% else %}
         osd-devices: {{ opnfv.storage_dict.ceph.disk }}
+{% endif %}
         osd-reformat: 'yes'
 {% if ubuntu.release == 'trusty' and os.release < 'newton' %}
         source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
@@ -53,9 +78,15 @@
 {% endif %}
       to:
 {% if os.hyperconverged %}
-{% for unit_id in range(0, opnfv.units) %}
+{% if opnfv.units >= 3 %}
+{% for unit_id in range(0, 3) %}
         - "nodes/{{ unit_id }}"
 {% endfor %}
+{% else %}
+ {% for unit_id in range(0, opnfv.units) %}
+         - "nodes/{{ unit_id }}"
+ {% endfor %}
+{% endif %}
 {% else %}
 {% if os.ha.mode == 'ha' %}
 {% for unit_id in range(0, 3) %}
@@ -70,9 +101,22 @@
     ceph-radosgw:
       charm: "./{{ ubuntu.release }}/ceph-radosgw"
       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 %}
+{% if opnfv.spaces_dict.storage is defined %}
+        mon: storage-cluster
+{% endif %}
+{% endif %}
       options:
         region: {{ os.region }}
-        use-embedded-webserver: true
         operator-roles: "Member,admin"
 {% if ubuntu.release == 'trusty' and os.release < 'newton' %}
         source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"